regress: Metaplugin RO updates.

diff --git a/regress/scripts/metaplugin-protocol-tests.sh b/regress/scripts/metaplugin-protocol-tests.sh
index e91b1a7c148236a1ad987aafaf90c1bb8a8ab0b6..30f775d03c843d7bf099540faef608c29b13019f 100755 (executable)
--- a/regress/scripts/metaplugin-protocol-tests.sh
+++ b/regress/scripts/metaplugin-protocol-tests.sh
@@ -28,7 +28,7 @@
 #
 
 if [ "x$JobBackup1" = "x" ] || [ "x$JobBackup2" = "x" ] || [ "x$JobBackup3" = "x" ] || [ "x$JobBackup4" = "x" ] || [ "x$JobBackup5" = "x" ] || [ "x$JobBackup6" = "x" ] || [ "x$JobBackup7" = "x" ] \
-   || [ "x$FilesetBackup1" = "x" ] || [ "x$FilesetBackup5" = "x" ]
+   || [ "x$FilesetBackup1" = "x" ] || [ "x$FilesetBackup3" = "x" ] || [ "x$FilesetBackup5" = "x" ]
 then
    echo "You have to setup required variables!"
    exit 2
@@ -229,6 +229,26 @@ END_OF_DATA
 
 run_bconsole
 
+# now test restore object job
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@#
+@# Restore
+@#
+@output /dev/null
+messages
+@$out ${cwd}/tmp/rlog6.out
+setdebug level=500 client=$CLIENT trace=1
+restore fileset=$FilesetBackup3 where=${cwd}/tmp select all storage=File done
+yes
+wait
+messages
+llist job=RestoreFiles
+@output
+quit
+END_OF_DATA
+
+run_bconsole
+
 # restore with metadata
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @#
@@ -537,6 +557,15 @@ then
    rstat=5
 fi
 
+RET=$(grep "jobstatus:" ${cwd}/tmp/rlog6.out | tail -1 | awk '{print $2}')
+REND=$(grep -w -c "TESTEND" ${cwd}/tmp/rlog6.out)
+RRO=$(grep -c "TEST6R" ${cwd}/tmp/rlog6.out)
+if [ "x$RET" != "xT" ] || [ "$REND" -ne 2 ] || [ "$RRO" -ne 2 ]
+then
+   echo "rlog6" "$RET" "$REND" "$RRO"
+   rstat=6
+fi
+
 RET=$(grep -c "m_id=test" ${cwd}/tmp/qlog1.out)
 if [ "$RET" -ne 3 ]
 then

diff --git a/regress/tests/kubernetes-plugin-protocol-test b/regress/tests/kubernetes-plugin-protocol-test
index f383537b09b67d6ba4e6bac6ede924bb99f04ec2..5eb6c5d4d0113c83ca7ca7d69e87d2a42c7e13d3 100755 (executable)
--- a/regress/tests/kubernetes-plugin-protocol-test
+++ b/regress/tests/kubernetes-plugin-protocol-test
@@ -7,6 +7,8 @@
 TestName="kubernetes-plugin-protocol-test"
 JobBackup1="PluginK8STestProtocol1"
 FilesetBackup1="TestPluginK8SSetProtocol1"
+FilesetBackup3="TestPluginK8SSetProtocol3"
+FilesetBackup5="TestPluginK8SSetProtocol5"
 JobBackup2="PluginK8STestProtocol2"
 JobBackup3="PluginK8STestProtocol3"
 JobBackup4="PluginK8STestProtocol4"

diff --git a/regress/tests/openshift-plugin-protocol-test b/regress/tests/openshift-plugin-protocol-test
index 61c1834c6594dc78648a6f64b3ad23c17488eb80..2bb641b002c632207bce5821c092c74678b08a5f 100755 (executable)
--- a/regress/tests/openshift-plugin-protocol-test
+++ b/regress/tests/openshift-plugin-protocol-test
@@ -7,6 +7,7 @@
 TestName="openshift-plugin-protocol-test"
 JobBackup1="PluginK8STestProtocol1"
 FilesetBackup1="TestPluginK8SSetProtocol1"
+FilesetBackup3="TestPluginK8SSetProtocol3"
 FilesetBackup5="TestPluginK8SSetProtocol5"
 JobBackup2="PluginK8STestProtocol2"
 JobBackup3="PluginK8STestProtocol3"

diff --git a/regress/tests/rhv-plugin-protocol-test b/regress/tests/rhv-plugin-protocol-test
index b534be6556b5acd0b6baaa05ac179ca9b7517703..72e91057edeaef414c4517758587055209edf053 100755 (executable)
--- a/regress/tests/rhv-plugin-protocol-test
+++ b/regress/tests/rhv-plugin-protocol-test
@@ -7,6 +7,11 @@
 TestName="rhv-plugin-protocol-test"
 JobBackup1="PluginRHEVTestProtocol1"
 FilesetBackup1="TestPluginRHEVSetProtocol1"
+<<<<<<< HEAD
+=======
+FilesetBackup3="TestPluginRHEVSetProtocol3"
+FilesetBackup5="TestPluginRHEVSetProtocol5"
+>>>>>>> c6cdeaf069 (regress: Metaplugin RO updates.)
 JobBackup2="PluginRHEVTestProtocol2"
 JobBackup3="PluginRHEVTestProtocol3"
 JobBackup4="PluginRHEVTestProtocol4"

diff --git a/regress/tests/swift-plugin-protocol-test b/regress/tests/swift-plugin-protocol-test
index a398aaa134f525676b63bfc275d9afc9aeec2385..cea8bcf03df4e91b386b65cb0f4e6a42886f6fe1 100755 (executable)
--- a/regress/tests/swift-plugin-protocol-test
+++ b/regress/tests/swift-plugin-protocol-test
@@ -7,6 +7,8 @@
 TestName="swift-plugin-protocol-test"
 JobBackup1="PluginSWIFTTestProtocol1"
 FilesetBackup1="TestPluginSWIFTSetProtocol1"
+FilesetBackup3="TestPluginSWIFTSetProtocol3"
+FilesetBackup5="TestPluginSWIFTSetProtocol5"
 JobBackup2="PluginSWIFTTestProtocol2"
 JobBackup3="PluginSWIFTTestProtocol3"
 JobBackup4="PluginSWIFTTestProtocol4"