[Patch v2 14/17] test: update dump-restore roundtripping test for batch-tag format

[Tomi Ollila]

On Sat, Nov 24 2012, david at tethera.net wrote:

> From: David Bremner 
>
> Now we can actually round trip these crazy tags and and message ids.
> hex-xcode is no longer needed as it's built in.
> ---
>  test/dump-restore |   13 +++--
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/test/dump-restore b/test/dump-restore
> index a2204fb..e08b656 100755
> --- a/test/dump-restore
> +++ b/test/dump-restore
> @@ -85,13 +85,14 @@ test_begin_subtest "dump --output=outfile -- from:cworth"
>  notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth
>  test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
>  
> +
>  test_expect_success 'roundtripping random message-ids and tags' \
> -'test_subtest_known_broken &&
> - ${TEST_DIRECTORY}/random-corpus --num-messages=10 
> --config-path=${NOTMUCH_CONFIG} &&
> - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > 
> EXPECTED.$test_count &&
> +'${TEST_DIRECTORY}/random-corpus --num-messages=100 
> --config-path=${NOTMUCH_CONFIG} &&
> + notmuch dump --format=batch-tag | sort > EXPECTED.$test_count &&
>   notmuch tag -random-corpus tag:random-corpus &&
> - ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count | 
> notmuch restore 2>/dev/null &&
> - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > 
> OUTPUT.$test_count &&
> + notmuch restore --format=batch-tag --input=EXPECTED.$test_count &&
> + notmuch dump --format=batch-tag | sort > OUTPUT.$test_count &&
>   test_cmp EXPECTED.$test_count OUTPUT.$test_count'
> -
>  test_done

In most cases there is empty line before `test_done` -- also other 
unrelated whitespace changes disturb review (especially when one is
tired ;)

> +
> +# Note the database is "poisoned" for sup format at this point.
> -- 
> 1.7.10.4

Tomi

[Patch v2 14/17] test: update dump-restore roundtripping test for batch-tag format

[da...@tethera.net]

From: David Bremner 

Now we can actually round trip these crazy tags and and message ids.
hex-xcode is no longer needed as it's built in.
---
 test/dump-restore |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/dump-restore b/test/dump-restore
index a2204fb..e08b656 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -85,13 +85,14 @@ test_begin_subtest "dump --output=outfile -- from:cworth"
 notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth
 test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual

+
 test_expect_success 'roundtripping random message-ids and tags' \
-'test_subtest_known_broken &&
- ${TEST_DIRECTORY}/random-corpus --num-messages=10 
--config-path=${NOTMUCH_CONFIG} &&
- notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > 
EXPECTED.$test_count &&
+'${TEST_DIRECTORY}/random-corpus --num-messages=100 
--config-path=${NOTMUCH_CONFIG} &&
+ notmuch dump --format=batch-tag | sort > EXPECTED.$test_count &&
  notmuch tag -random-corpus tag:random-corpus &&
- ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count | 
notmuch restore 2>/dev/null &&
- notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > 
OUTPUT.$test_count &&
+ notmuch restore --format=batch-tag --input=EXPECTED.$test_count &&
+ notmuch dump --format=batch-tag | sort > OUTPUT.$test_count &&
  test_cmp EXPECTED.$test_count OUTPUT.$test_count'
-
 test_done
+
+# Note the database is "poisoned" for sup format at this point.
-- 
1.7.10.4

[Patch v2 14/17] test: update dump-restore roundtripping test for batch-tag format

[david]

From: David Bremner brem...@debian.org

Now we can actually round trip these crazy tags and and message ids.
hex-xcode is no longer needed as it's built in.
---
 test/dump-restore |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/dump-restore b/test/dump-restore
index a2204fb..e08b656 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -85,13 +85,14 @@ test_begin_subtest dump --output=outfile -- from:cworth
 notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth
 test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
 
+
 test_expect_success 'roundtripping random message-ids and tags' \
-'test_subtest_known_broken 
- ${TEST_DIRECTORY}/random-corpus --num-messages=10 
--config-path=${NOTMUCH_CONFIG} 
- notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode  
EXPECTED.$test_count 
+'${TEST_DIRECTORY}/random-corpus --num-messages=100 
--config-path=${NOTMUCH_CONFIG} 
+ notmuch dump --format=batch-tag | sort  EXPECTED.$test_count 
  notmuch tag -random-corpus tag:random-corpus 
- ${TEST_DIRECTORY}/hex-xcode --direction=decode  EXPECTED.$test_count | 
notmuch restore 2/dev/null 
- notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode  
OUTPUT.$test_count 
+ notmuch restore --format=batch-tag --input=EXPECTED.$test_count 
+ notmuch dump --format=batch-tag | sort  OUTPUT.$test_count 
  test_cmp EXPECTED.$test_count OUTPUT.$test_count'
-
 test_done
+
+# Note the database is poisoned for sup format at this point.
-- 
1.7.10.4

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [Patch v2 14/17] test: update dump-restore roundtripping test for batch-tag format

[Tomi Ollila]

On Sat, Nov 24 2012, da...@tethera.net wrote:

 From: David Bremner brem...@debian.org

 Now we can actually round trip these crazy tags and and message ids.
 hex-xcode is no longer needed as it's built in.
 ---
  test/dump-restore |   13 +++--
  1 file changed, 7 insertions(+), 6 deletions(-)

 diff --git a/test/dump-restore b/test/dump-restore
 index a2204fb..e08b656 100755
 --- a/test/dump-restore
 +++ b/test/dump-restore
 @@ -85,13 +85,14 @@ test_begin_subtest dump --output=outfile -- from:cworth
  notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth
  test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
  
 +
  test_expect_success 'roundtripping random message-ids and tags' \
 -'test_subtest_known_broken 
 - ${TEST_DIRECTORY}/random-corpus --num-messages=10 
 --config-path=${NOTMUCH_CONFIG} 
 - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode  
 EXPECTED.$test_count 
 +'${TEST_DIRECTORY}/random-corpus --num-messages=100 
 --config-path=${NOTMUCH_CONFIG} 
 + notmuch dump --format=batch-tag | sort  EXPECTED.$test_count 
   notmuch tag -random-corpus tag:random-corpus 
 - ${TEST_DIRECTORY}/hex-xcode --direction=decode  EXPECTED.$test_count | 
 notmuch restore 2/dev/null 
 - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode  
 OUTPUT.$test_count 
 + notmuch restore --format=batch-tag --input=EXPECTED.$test_count 
 + notmuch dump --format=batch-tag | sort  OUTPUT.$test_count 
   test_cmp EXPECTED.$test_count OUTPUT.$test_count'
 -
  test_done

In most cases there is empty line before `test_done` -- also other 
unrelated whitespace changes disturb review (especially when one is
tired ;)

 +
 +# Note the database is poisoned for sup format at this point.
 -- 
 1.7.10.4

Tomi
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch