archive: fix tests after archive command changes

Author: MarcKe

Diff for: test/black-box/archive/run.sh

@@ -14,11 +14,14 @@ archive:
     path: "$(mangle_path "$archiveDir")"
 EOF
 
+function clean_output () {
+  echo $(echo "$@" | sed 1d | sed "s/^[ \t]*//")
+}
+
 # fill archive
 run_bob build --download=no --upload root-alpha root-bravo
 FINGERPRINT=Alice run_bob build --force --download=no --upload root-alpha root-bravo
 
-pushd $archiveDir
 run_bob archive scan
 
 # first try to keep everything by using multiple expressions
@@ -28,13 +31,14 @@ newNum=$(/usr/bin/find -name '*.tgz' | wc -l)
 test $oldNum -eq $newNum
 
 # Find one of the artifacts
-found=$(run_bob archive find 'meta.package == "root-bravo"')
+found=$(clean_output "$(run_bob archive find 'meta.package == "root-bravo"')")
+pushd $archiveDir
 expect_exist "$found"
+popd
 
 # selectively keep one half
 run_bob archive clean --dry-run 'metaEnv.TYPE == "alpha"'
 run_bob archive clean -v 'metaEnv.TYPE == "alpha"'
-popd
 
 # alpha can be downloaded, bravo must fail
 rm -rf work
@@ -48,29 +52,26 @@ pushd $archiveDir
 mkdir -p 64/ad
 /usr/bin/tar zcf 64/ad/6386bae45ebd6788e404758a247e26e5c778-1.tgz /dev/zero
 touch 64/ad/aabbcc-too-short.tgz
-run_bob archive scan
 popd
 
+run_bob archive scan
 # Test that -v doesn't catch fire
 run_bob archive scan -v
 run_bob archive clean -v 'metaEnv.TYPE == "alpha"'
 
-# Test for --fail option
+# Test for --fail option (--fail only reports -1 if there are no files matching the pattern xx/xx/hash-1.tgz)
+expect_success run_bob archive scan --fail -v
+expect_success run_bob archive clean --fail -v 'metaEnv.TYPE == "alpha"'
+rm -rf work $archiveDir/*
 expect_fail run_bob archive scan --fail -v
 expect_fail run_bob archive clean --fail -v 'metaEnv.TYPE == "alpha"'
-pushd $archiveDir
-run_bob archive scan --fail -v
-run_bob archive clean --fail -v 'metaEnv.TYPE == "alpha"'
-popd
 
 # Test the "LIMIT" feature. Build a number or artifacts and keep only a portion
 # of them. By default the artifacts are sorted by build date and the most
 # recent is kept. Verify that the correct subset was retained.
 rm -rf "$archiveDir/"*
 run_bob build --download no --upload -q 'many-*'
-pushd $archiveDir
 run_bob archive clean --fail -v 'meta.recipe == "many" LIMIT 3'
-popd
 test $(/usr/bin/find $archiveDir -name '*.tgz' | wc -l) -eq 3
 run_bob build --download forced --force many-07 many-06 many-05
 
@@ -79,31 +80,27 @@ run_bob build --download forced --force many-07 many-06 many-05
 # must not be counted.
 rm -rf "$archiveDir/"*
 run_bob build --download no --force --upload -q 'many-*'
-pushd $archiveDir
 run_bob archive clean --fail -v 'meta.recipe == "many" LIMIT 2 OrDeR By metaEnv.FUZZ ASC'
-popd
 test $(/usr/bin/find $archiveDir -name '*.tgz' | wc -l) -eq 2
 run_bob build --download forced --force many-01 many-03
 
 # Must fail if LIMIT is zero, invalid or negative
-pushd $archiveDir
 expect_fail run_bob archive clean 'meta.recipe == "many" LIMIT 0'
 expect_fail run_bob archive clean 'meta.recipe == "many" LIMIT -3'
 expect_fail run_bob archive clean 'meta.recipe == "many" LIMIT foobar'
-popd
 
 # Build artifacts with special audit meta keys. Try to find them later.
 rm -rf "$archiveDir/"* work
 run_bob build --upload -M my-key=one root-alpha
 run_bob build --upload -M my-key=two root-bravo
-pushd $archiveDir
 run_bob archive scan --fail
-found1=$(run_bob archive find -n 'meta.recipe == "root" && meta.my-key == "one"')
+found1=$(clean_output "$(run_bob archive find -n 'meta.recipe == "root" && meta.my-key == "one"')")
+found2=$(clean_output "$(run_bob archive find -n 'meta.recipe == "root" && meta.my-key == "two"')")
+pushd $archiveDir
 expect_exist "$found1"
-found2=$(run_bob archive find -n 'meta.recipe == "root" && meta.my-key == "two"')
 expect_exist "$found2"
-test "$found1" != "$found2"
 popd
+test "$found1" != "$found2"
 
 # Make sure invalid audit meta keys are rejected
 expect_fail run_bob build -M "!nv@l1d=key" root-alpha

Diff for: test/test-lib.sh

@@ -154,6 +154,15 @@ expect_fail()
 	return 1
 }
 
+expect_success()
+{
+	if "$@" 2>&1 ; then
+		return 0
+	fi
+	echo "Expected command to succeed: $*" >&2
+	return 1
+}
+
 expect_output()
 {
 	local EXP="$1"

Diff for: test/unit/test_archive.py

@@ -581,6 +581,12 @@ def do_MKCOL(self):
                 self.send_response(403)
             self.end_headers()
 
+        def do_OPTIONS(self):
+            self.send_response(200)
+            self.send_header('DAV', '1,2')
+            self.send_header('Allow', "OPTIONS, GET, HEAD, PUT")
+            self.end_headers()
+
     return Handler
 
 class TestLocalArchive(BaseTester, TestCase):