summaryrefslogtreecommitdiffstats
path: root/tests/bugs/bug-857330/common.rc
diff options
context:
space:
mode:
Diffstat (limited to 'tests/bugs/bug-857330/common.rc')
-rw-r--r--tests/bugs/bug-857330/common.rc27
1 files changed, 4 insertions, 23 deletions
diff --git a/tests/bugs/bug-857330/common.rc b/tests/bugs/bug-857330/common.rc
index 40da95e8c33..4e5a73a0bb1 100644
--- a/tests/bugs/bug-857330/common.rc
+++ b/tests/bugs/bug-857330/common.rc
@@ -20,19 +20,10 @@ function check-and-store-task-id()
return 0;
}
-function check-with-stored-task-id()
+function get-task-id()
{
- local task_id=$($CLI $COMMAND | grep $PATTERN | grep -o -E "$UUID_REGEX")
-
- if [ -z "$task_id" ] && [ "${task_id+asdf}" = "asdf" ]; then
- return 1
- fi
+ $CLI $COMMAND | grep $PATTERN | grep -o -E "$UUID_REGEX"
- if [ "$TASK_ID" != "$task_id" ]; then
- return 1
- fi
-
- return 0
}
function check-and-store-task-id-xml()
@@ -49,19 +40,9 @@ function check-and-store-task-id-xml()
return 0;
}
-function check-with-stored-task-id-xml()
+function get-task-id-xml()
{
- local task_id=$($CLI $COMMAND --xml | xmllint --format - | grep $PATTERN | grep -o -E "$UUID_REGEX")
-
- if [ -z "$task_id" ] && [ "${task_id+asdf}" = "asdf" ]; then
- return 1
- fi
-
- if [ "$TASK_ID" != "$task_id" ]; then
- return 1
- fi
-
- return 0
+ $CLI $COMMAND --xml | xmllint --format - | grep $PATTERN | grep -o -E "$UUID_REGEX"
}
function get-task-status()