From 1cbc2a365b041008687eccf2c000aeb1a71d484b Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrew@servalproject.org>
Date: Fri, 14 Nov 2014 12:58:49 +1030
Subject: [PATCH] Improve Rhizome AddUpdateSameVersion test

If 'rhizome add file' command does not return status 1,
then cat the standard error (log) to the test log
---
 tests/rhizomeops | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rhizomeops b/tests/rhizomeops
index 6f1e98b5..b034039f 100755
--- a/tests/rhizomeops
+++ b/tests/rhizomeops
@@ -671,8 +671,8 @@ test_AddUpdateSameVersion() {
    # Try to add another file using an existing manifest Id and Version, should
    # fail and update the manifest file to show existing bundle's manifest.
    tfw_cat -v file1_2.manifest
-   execute --exit-status=1 $servald rhizome add file $SIDB1 file1_2 file1_2.manifest
-   assertExitStatus --stderr '!=' 0
+   execute $servald rhizome add file $SIDB1 file1_2 file1_2.manifest
+   assertExitStatus --stderr '==' 1
    tfw_cat -v file1_2.manifest file1.manifest
    assert cmp file1_2.manifest file1.manifest
    # And rhizome store should be unchanged.