[PATCH] test: fix hardcoded paths in T050-new.sh

classic Classic list List threaded Threaded
3 messages Options
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

[PATCH] test: fix hardcoded paths in T050-new.sh

The previous paths will fail almost everywhere.
---
 test/T050-new.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/T050-new.sh b/test/T050-new.sh
index 40c5e6fa..dfc8508f 100755
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -238,12 +238,12 @@ notmuch config set new.ignore .git ignored_file .ignored_hidden_file
 touch "${MAIL_DIR}"/.git # change .git's mtime for notmuch new to rescan.
 NOTMUCH_NEW --debug 2>&1 | sort > OUTPUT
 cat <<EOF > EXPECTED
-(D) add_files, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.git
-(D) add_files, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.ignored_hidden_file
-(D) add_files, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/ignored_file
-(D) add_files, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.git
-(D) add_files, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.ignored_hidden_file
-(D) add_files, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/ignored_file
+(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.git
+(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
+(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file
+(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.git
+(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
+(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file
 Added 1 new message to the database.
 EOF
 test_expect_equal_file EXPECTED OUTPUT
--
2.17.0

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
Tomi Ollila-2 Tomi Ollila-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] test: fix hardcoded paths in T050-new.sh

On Sat, May 26 2018, David Bremner wrote:

> The previous paths will fail almost everywhere.

Who reviewed this commit? me? ;)

+1

Tomi


> ---
>  test/T050-new.sh | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/test/T050-new.sh b/test/T050-new.sh
> index 40c5e6fa..dfc8508f 100755
> --- a/test/T050-new.sh
> +++ b/test/T050-new.sh
> @@ -238,12 +238,12 @@ notmuch config set new.ignore .git ignored_file .ignored_hidden_file
>  touch "${MAIL_DIR}"/.git # change .git's mtime for notmuch new to rescan.
>  NOTMUCH_NEW --debug 2>&1 | sort > OUTPUT
>  cat <<EOF > EXPECTED
> -(D) add_files, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.git
> -(D) add_files, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.ignored_hidden_file
> -(D) add_files, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/ignored_file
> -(D) add_files, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.git
> -(D) add_files, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/.ignored_hidden_file
> -(D) add_files, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.T050-new/mail/ignored_file
> +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.git
> +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
> +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file
> +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.git
> +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
> +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file
>  Added 1 new message to the database.
>  EOF
>  test_expect_equal_file EXPECTED OUTPUT
> --
> 2.17.0
>
> _______________________________________________
> notmuch mailing list
> [hidden email]
> https://notmuchmail.org/mailman/listinfo/notmuch
_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] test: fix hardcoded paths in T050-new.sh

Tomi Ollila <[hidden email]> writes:

> On Sat, May 26 2018, David Bremner wrote:
>
>> The previous paths will fail almost everywhere.
>
> Who reviewed this commit? me? ;)
>
> +1
>

Hopefully we got it right this time, that's part of 0.27_rc0
_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch