acceptance tests: More tests

diff --git a/deltarepo/acceptance_tests/repos/repo3/repodata/b8dda154f20b5d020b28cfb7af4f747f78738d73508acaea43e6d65a76bc596a-comps.xml.xz b/deltarepo/acceptance_tests/repos/repo3/repodata/b8dda154f20b5d020b28cfb7af4f747f78738d73508acaea43e6d65a76bc596a-comps.xml.xz
deleted file mode 100644 (file)
index f650f75..0000000
Binary files a/deltarepo/acceptance_tests/repos/repo3/repodata/b8dda154f20b5d020b28cfb7af4f747f78738d73508acaea43e6d65a76bc596a-comps.xml.xz and /dev/null differ

diff --git a/deltarepo/acceptance_tests/repos/repo3_md5/repodata/219e3abab80cf0d6f0f086e2cb921ebd-comps.xml.gz b/deltarepo/acceptance_tests/repos/repo3_md5/repodata/219e3abab80cf0d6f0f086e2cb921ebd-comps.xml.gz
deleted file mode 100644 (file)
index f0ab5f6..0000000
Binary files a/deltarepo/acceptance_tests/repos/repo3_md5/repodata/219e3abab80cf0d6f0f086e2cb921ebd-comps.xml.gz and /dev/null differ

diff --git a/deltarepo/acceptance_tests/test.sh b/deltarepo/acceptance_tests/test.sh
index 26525fe..2acedb6 100755 (executable)
--- a/deltarepo/acceptance_tests/test.sh
+++ b/deltarepo/acceptance_tests/test.sh
@@ -34,6 +34,7 @@ function compare_repos {
     diff -r $1/repodata $2/repodata \
         -I "<timestamp>[0-9]*</timestamp>" \
         -I "<repoid .*>.*</repoid>"
+    echo
 
     return $?
 }
@@ -45,11 +46,12 @@ TESTCASEID=0
 function testcase01 {
     # Arguments are: REPO_old REPO_new
 
-    TCNAME="$TESTCASEID: $FUNCNAME $1 $2"
-    TCDIR=$(testcase_outdir "$TESTCASEID-$FUNCNAME")
-
+    IDSTR=$(printf "%02d\n" $TESTCASEID)
     TESTCASEID=$[$TESTCASEID+1]
 
+    TCNAME="$IDSTR: $FUNCNAME $1 $2"
+    TCDIR=$(testcase_outdir "$IDSTR-$FUNCNAME")
+
     echo "==============================================="
     echo "$TCNAME ($TCDIR)";
     echo "==============================================="
@@ -67,9 +69,15 @@ function testcase01 {
 
 testcase01 $REPO1 $REPO2
 testcase01 $REPO1 $REPO3
+testcase01 $REPO1 $REPO3_MD5
 testcase01 $REPO2 $REPO1
 testcase01 $REPO2 $REPO3
+testcase01 $REPO2 $REPO3_MD5
 testcase01 $REPO3 $REPO1
 testcase01 $REPO3 $REPO2
+testcase01 $REPO3 $REPO3_MD5
+testcase01 $REPO3_MD5 $REPO1
+testcase01 $REPO3_MD5 $REPO2
+testcase01 $REPO3_MD5 $REPO3
 
 popd > /dev/null