[PATCH] test/libconfig: make indexing more consistent

[PATCH] test/libconfig: make indexing more consistent

[David Bremner]

The other tests have converted to two digit decimal, the commit does
the same to the remaining test that was printing out indices in hex.
---
 test/T590-libconfig.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index bc7298f8..189381f7 100755
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -713,23 +713,23 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
 	 key < NOTMUCH_CONFIG_LAST;
 	 key = (notmuch_config_key_t)(key + 1)) {
 	const char *val = notmuch_config_get (db, key);
-	printf("%x: '%s'\n", key, val ? val : "NULL" );
+	printf("%02d: '%s'\n", key, val ? val : "NULL" );
     }
 }
 EOF
 cat <<'EOF' >EXPECTED
 == stdout ==
-0: 'MAIL_DIR'
-1: 'MAIL_DIR'
-2: 'MAIL_DIR/.notmuch/hooks'
-3: 'MAIL_DIR/.notmuch/backups'
-4: 'foo;bar;fub'
-5: 'unread;inbox'
-6: 'sekrit_junk'
-7: 'true'
-8: 'test_suite@notmuchmail.org'
-9: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
-a: 'Notmuch Test Suite'
+00: 'MAIL_DIR'
+01: 'MAIL_DIR'
+02: 'MAIL_DIR/.notmuch/hooks'
+03: 'MAIL_DIR/.notmuch/backups'
+04: 'foo;bar;fub'
+05: 'unread;inbox'
+06: 'sekrit_junk'
+07: 'true'
+08: 'test_suite@notmuchmail.org'
+09: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
+10: 'Notmuch Test Suite'
 == stderr ==
 EOF
 test_expect_equal_file EXPECTED OUTPUT
-- 
2.30.2

Re: [PATCH] test/libconfig: make indexing more consistent

[Tomi Ollila]

On Sat, Jun 19 2021, David Bremner wrote:

> The other tests have converted to two digit decimal, the commit does
> the same to the remaining test that was printing out indices in hex.

LGTM.

Tomi

> ---
>  test/T590-libconfig.sh | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
> index bc7298f8..189381f7 100755
> --- a/test/T590-libconfig.sh
> +++ b/test/T590-libconfig.sh
> @@ -713,23 +713,23 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
>  	 key < NOTMUCH_CONFIG_LAST;
>  	 key = (notmuch_config_key_t)(key + 1)) {
>  	const char *val = notmuch_config_get (db, key);
> -	printf("%x: '%s'\n", key, val ? val : "NULL" );
> +	printf("%02d: '%s'\n", key, val ? val : "NULL" );
>      }
>  }
>  EOF
>  cat <<'EOF' >EXPECTED
>  == stdout ==
> -0: 'MAIL_DIR'
> -1: 'MAIL_DIR'
> -2: 'MAIL_DIR/.notmuch/hooks'
> -3: 'MAIL_DIR/.notmuch/backups'
> -4: 'foo;bar;fub'
> -5: 'unread;inbox'
> -6: 'sekrit_junk'
> -7: 'true'
> -8: 'test_suite@notmuchmail.org'
> -9: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
> -a: 'Notmuch Test Suite'
> +00: 'MAIL_DIR'
> +01: 'MAIL_DIR'
> +02: 'MAIL_DIR/.notmuch/hooks'
> +03: 'MAIL_DIR/.notmuch/backups'
> +04: 'foo;bar;fub'
> +05: 'unread;inbox'
> +06: 'sekrit_junk'
> +07: 'true'
> +08: 'test_suite@notmuchmail.org'
> +09: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
> +10: 'Notmuch Test Suite'
>  == stderr ==
>  EOF
>  test_expect_equal_file EXPECTED OUTPUT
> -- 
> 2.30.2
> _______________________________________________
> notmuch mailing list -- notmuch@notmuchmail.org
> To unsubscribe send an email to notmuch-leave@notmuchmail.org

Re: [PATCH] test/libconfig: make indexing more consistent

[David Bremner]

David Bremner <david@tethera.net> writes:

> The other tests have converted to two digit decimal, the commit does
> the same to the remaining test that was printing out indices in hex.

applied to master.

d