Fix convert5to6 black box test

Summain was including user/group information in
the manifest, which meant the test would only
ever work for username liw, uid 1000, group liw,
gid 1000.

3 files changed, 4 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index ee74bdb8..8fb603be 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ Version 0.28, released UNRELEASED; a BETA release
   Previously, Obnam would continue, ignoring the failure to write. If you
   make space in the repository and restart Obnam, it will continue from
   the previous checkpoint.
+* The convert5to6 black box test now works even if run by other people
+  than liw.
 
 Version 0.27, released 2012-04-30; a BETA release
 -------------------------------------------------
diff --git a/test-data/repo-format-5-encrypted-gzipped.tar.gz b/test-data/repo-format-5-encrypted-gzipped.tar.gz
index 1b90616a..6d97ad0b 100644
--- a/test-data/repo-format-5-encrypted-gzipped.tar.gz
+++ b/test-data/repo-format-5-encrypted-gzipped.tar.gz
diff --git a/tests/convert5to6.script b/tests/convert5to6.script
index eccfe0f4..7dfe3f74 100755
--- a/tests/convert5to6.script
+++ b/tests/convert5to6.script
@@ -26,6 +26,7 @@ tar -xf "$SRCDIR/test-data/repo-format-5-encrypted-gzipped.tar.gz"
 "$SRCDIR/tests/obnam" restore \
     -r repo --encrypt-with=1B321347 --compress-with=gzip --to=restored
 (cd "restored/home/liw/obnam/convert-5to6/t" && 
- summain data) > restored.summain
+ summain --exclude=Username --exclude=Uid --exclude=Group --exclude=Gid data) \
+    > restored.summain
 diff -u data.summain restored.summain