Add a "no_result" key in JSON test files because "(?!...)" regular expression doesn...

Change-Id: I67a8b6a529b71bc7499ba68cb431403a63482c1c

diff --git a/moonclient/moonclient/shell.py b/moonclient/moonclient/shell.py
index 8343d86..65adbc0 100644 (file)
--- a/moonclient/moonclient/shell.py
+++ b/moonclient/moonclient/shell.py
@@ -178,7 +178,7 @@ class MoonClient(App):
                         content['error']['message'],
                     ))
                 except ValueError:
-                    raise Exception("Getting an error while requiring {} ({})".format(url, content))
+                    raise Exception("Bad error format while requiring {} ({})".format(url, content))
             return content
         except ValueError:
             raise Exception("Getting an error while requiring {} ({})".format(url, content))

diff --git a/moonclient/moonclient/tests.py b/moonclient/moonclient/tests.py
index e85c276..24732db 100644 (file)
--- a/moonclient/moonclient/tests.py
+++ b/moonclient/moonclient/tests.py
@@ -136,8 +136,12 @@ class TestsLaunch(Lister):
                     self.logfile.write("{}".format(result_str))
                 data_tmp.append(group_name)
                 data_tmp.append(test["name"])
-                compare = self.__compare_results(self.__replace_var_in_str(test["result"]), result_str)
-                self.logfile.write("\\---->{}: {}\n\n".format(compare, self.__replace_var_in_str(test["result"])))
+                if "result" in test:
+                    compare = self.__compare_results(self.__replace_var_in_str(test["result"]), result_str)
+                    self.logfile.write("\\---->{}: {}\n\n".format(compare, self.__replace_var_in_str(test["result"])))
+                else:
+                    compare = not self.__compare_results(self.__replace_var_in_str(test["no_result"]), result_str)
+                    self.logfile.write("\\---->{}: not {}\n\n".format(compare, self.__replace_var_in_str(test["no_result"])))
                 if error_str:
                     if compare:
                         compare = "\033[33mTrue\033[m"

diff --git a/moonclient/moonclient/tests/tests_action_assignments.json b/moonclient/moonclient/tests/tests_action_assignments.json
index dc9cb27..4ce5833 100644 (file)
--- a/moonclient/moonclient/tests/tests_action_assignments.json
+++ b/moonclient/moonclient/tests/tests_action_assignments.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -121,7 +121,7 @@
       {
         "name": "check_deleted_assignment",
         "command": "action assignment list $uuid_action $uuid_action_category",
-        "result": "(?!$uuid_action_scope)",
+        "no_result": "$uuid_action_scope",
         "description": "Check deleted assignment.",
         "command_options": "-c id -f value"
       },
@@ -143,7 +143,7 @@
       {
         "name": "list_action_category",
         "command": "action category list",
-        "result": "(?!$uuid_action_category)",
+        "no_result": "$uuid_action_category",
         "description": "Check that my_new_action_category action_category was deleted."
       },
       {
@@ -165,7 +165,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -315,7 +315,7 @@
       {
         "name": "check_deleted_assignment",
         "command": "action assignment list $uuid_action $uuid_action_category",
-        "result": "(?!$uuid_action_scope)",
+        "no_result": "$uuid_action_scope",
         "description": "Check deleted assignment.",
         "command_options": "-c id -f value"
       },
@@ -337,7 +337,7 @@
       {
         "name": "list_action_category",
         "command": "action category list",
-        "result": "(?!$uuid_action_category)",
+        "no_result": "$uuid_action_category",
         "description": "Check that my_new_action_category action_category was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_action_categories.json b/moonclient/moonclient/tests/tests_action_categories.json
index bf6a72c..d748570 100644 (file)
--- a/moonclient/moonclient/tests/tests_action_categories.json
+++ b/moonclient/moonclient/tests/tests_action_categories.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -78,7 +78,7 @@
       {
         "name": "list_action_category",
         "command": "action category list",
-        "result": "(?!$uuid_action_category)",
+        "no_result": "$uuid_action_category",
         "description": "Check that my_new_action_category action_category was deleted."
       },
       {
@@ -100,7 +100,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -207,7 +207,7 @@
       {
         "name": "list_action_category",
         "command": "action category list",
-        "result": "(?!$uuid_action_category)",
+        "no_result": "$uuid_action_category",
         "description": "Check that my_new_action_category action_category was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_action_scopes.json b/moonclient/moonclient/tests/tests_action_scopes.json
index 437c8e6..2dd26c6 100644 (file)
--- a/moonclient/moonclient/tests/tests_action_scopes.json
+++ b/moonclient/moonclient/tests/tests_action_scopes.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -86,7 +86,7 @@
       {
         "name": "check_deleted_scope",
         "command": "action scope list $uuid_action_category",
-        "result": "(?!$uuid_action_scope)",
+        "no_result": "$uuid_action_scope",
         "description": "Check deleted scope.",
         "command_options": "-c id -f value"
       },
@@ -109,7 +109,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -224,7 +224,7 @@
       {
         "name": "check_deleted_scope",
         "command": "action scope list $uuid_action_category",
-        "result": "(?!$uuid_action_scope)",
+        "no_result": "$uuid_action_scope",
         "description": "Check deleted scope.",
         "command_options": "-c id -f value"
       },

diff --git a/moonclient/moonclient/tests/tests_actions.json b/moonclient/moonclient/tests/tests_actions.json
index f565cca..f512a91 100644 (file)
--- a/moonclient/moonclient/tests/tests_actions.json
+++ b/moonclient/moonclient/tests/tests_actions.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -78,7 +78,7 @@
       {
         "name": "list_action",
         "command": "action list",
-        "result": "(?!$uuid_action)",
+        "no_result": "$uuid_action",
         "description": "Check that new_action_1 action was deleted."
       },
       {
@@ -100,7 +100,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -207,7 +207,7 @@
       {
         "name": "list_action",
         "command": "action list",
-        "result": "(?!$uuid_action)",
+        "no_result": "$uuid_action",
         "description": "Check that new_action_1 action was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_admin_intraextensions.json b/moonclient/moonclient/tests/tests_admin_intraextensions.json
index 40ac04a..5d3fa92 100644 (file)
--- a/moonclient/moonclient/tests/tests_admin_intraextensions.json
+++ b/moonclient/moonclient/tests/tests_admin_intraextensions.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "List all tenants (must be empty)"
       },
       {

diff --git a/moonclient/moonclient/tests/tests_configuration.json b/moonclient/moonclient/tests/tests_configuration.json
index d712a0f..3ad327c 100644 (file)
--- a/moonclient/moonclient/tests/tests_configuration.json
+++ b/moonclient/moonclient/tests/tests_configuration.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -97,7 +97,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_empty_policy_new_user.json b/moonclient/moonclient/tests/tests_empty_policy_new_user.json
index 6344a3e..3e03fdf 100644 (file)
--- a/moonclient/moonclient/tests/tests_empty_policy_new_user.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_new_user.json
@@ -29,7 +29,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!demo)",
+        "no_result": "demo",
         "description": "Check if tenant demo is used."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_empty_policy_nova.json b/moonclient/moonclient/tests/tests_empty_policy_nova.json
index c17d825..6348221 100644 (file)
--- a/moonclient/moonclient/tests/tests_empty_policy_nova.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_nova.json
@@ -29,7 +29,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!demo)",
+        "no_result": "demo",
         "description": "Check if tenant demo is used."
       },
       {
@@ -876,7 +876,7 @@
       {
         "name": "check nova command",
         "external_command": "nova list",
-        "result": "(?!test_moonclient)",
+        "no_result": "test_moonclient",
         "description": "Check that we cannot list nova servers due to the current rules"
       },
       {

diff --git a/moonclient/moonclient/tests/tests_empty_policy_swift.json b/moonclient/moonclient/tests/tests_empty_policy_swift.json
index e31e66c..a1c197c 100644 (file)
--- a/moonclient/moonclient/tests/tests_empty_policy_swift.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_swift.json
@@ -5,7 +5,7 @@
       {
         "name": "swift list",
         "external_command": "swift list",
-        "result": "(?!moonclient_test)",
+        "no_result": "moonclient_test",
         "description": "Check Swift command"
       },
       {
@@ -30,7 +30,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!demo)",
+        "no_result": "demo",
         "description": "Check if tenant demo is used."
       },
       {
@@ -877,7 +877,7 @@
       {
         "name": "swift list",
         "external_command": "swift list",
-        "result": "(?!moonclient_test)",
+        "no_result": "moonclient_test",
         "description": "Check Swift command, it must be impossible due to current rules"
       },
 
@@ -964,7 +964,7 @@
       {
         "name": "swift list",
         "external_command": "swift list moonclient_test",
-        "result": "(?!tmp/test.txt)",
+        "no_result": "tmp/test.txt",
         "description": "Check that test file has not been uploaded."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_external_commands.json b/moonclient/moonclient/tests/tests_external_commands.json
index 0aa6f70..0b212e9 100644 (file)
--- a/moonclient/moonclient/tests/tests_external_commands.json
+++ b/moonclient/moonclient/tests/tests_external_commands.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!demo)",
+        "no_result": "demo",
         "description": "List all tenants (must be empty)"
       },
       {

diff --git a/moonclient/moonclient/tests/tests_object_assignments.json b/moonclient/moonclient/tests/tests_object_assignments.json
index 35fd34a..fa834cc 100644 (file)
--- a/moonclient/moonclient/tests/tests_object_assignments.json
+++ b/moonclient/moonclient/tests/tests_object_assignments.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -121,7 +121,7 @@
       {
         "name": "check_deleted_assignment",
         "command": "object assignment list $uuid_object $uuid_object_category",
-        "result": "(?!$uuid_object_scope)",
+        "no_result": "$uuid_object_scope",
         "description": "Check deleted assignment.",
         "command_options": "-c id -f value"
       },
@@ -133,6 +133,13 @@
         "description": "Delete one scope from object category role",
         "command_options": ""
       },
+      {
+        "name": "check_added_scope",
+        "command": "object scope list $uuid_object_category",
+        "no_result": "$uuid_object_scope",
+        "description": "Check added scope was deleted.",
+        "command_options": "-c id -f value"
+      },
       {
         "name": "delete_object_category",
         "command": "object category delete $uuid_object_category",
@@ -143,7 +150,7 @@
       {
         "name": "list_object_category",
         "command": "object category list",
-        "result": "(?!$uuid_object_category)",
+        "no_result": "$uuid_object_category",
         "description": "Check that my_new_object_category object_category was deleted."
       },
       {
@@ -165,7 +172,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -315,7 +322,7 @@
       {
         "name": "check_deleted_assignment",
         "command": "object assignment list $uuid_object $uuid_object_category",
-        "result": "(?!$uuid_object_scope)",
+        "no_result": "$uuid_object_scope",
         "description": "Check deleted assignment.",
         "command_options": "-c id -f value"
       },
@@ -327,6 +334,13 @@
         "description": "Delete one scope from object category role",
         "command_options": ""
       },
+      {
+        "name": "check_deleted_scope",
+        "command": "object scope list $uuid_object_category",
+        "no_result": "$uuid_object_scope",
+        "description": "Check added scope was deleted.",
+        "command_options": "-c id -f value"
+      },
       {
         "name": "delete_object_category",
         "command": "object category delete $uuid_object_category",
@@ -337,7 +351,7 @@
       {
         "name": "list_object_category",
         "command": "object category list",
-        "result": "(?!$uuid_object_category)",
+        "no_result": "$uuid_object_category",
         "description": "Check that my_new_object_category object_category was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_object_categories.json b/moonclient/moonclient/tests/tests_object_categories.json
index a646464..a8a8011 100644 (file)
--- a/moonclient/moonclient/tests/tests_object_categories.json
+++ b/moonclient/moonclient/tests/tests_object_categories.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -78,7 +78,7 @@
       {
         "name": "list_object_category",
         "command": "object category list",
-        "result": "(?!$uuid_object_category)",
+        "no_result": "$uuid_object_category",
         "description": "Check that my_new_object_category object_category was deleted."
       },
       {
@@ -100,7 +100,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -207,7 +207,7 @@
       {
         "name": "list_object_category",
         "command": "object category list",
-        "result": "(?!$uuid_object_category)",
+        "no_result": "$uuid_object_category",
         "description": "Check that my_new_object_category object_category was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_object_scopes.json b/moonclient/moonclient/tests/tests_object_scopes.json
index c9f832e..b97636b 100644 (file)
--- a/moonclient/moonclient/tests/tests_object_scopes.json
+++ b/moonclient/moonclient/tests/tests_object_scopes.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -86,7 +86,7 @@
       {
         "name": "check_deleted_scope",
         "command": "object scope list $uuid_object_category",
-        "result": "(?!$uuid_object_scope)",
+        "no_result": "$uuid_object_scope",
         "description": "Check deleted scope.",
         "command_options": "-c id -f value"
       },
@@ -109,7 +109,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -224,7 +224,7 @@
       {
         "name": "check_deleted_scope",
         "command": "object scope list $uuid_object_category",
-        "result": "(?!$uuid_object_scope)",
+        "no_result": "$uuid_object_scope",
         "description": "Check deleted scope.",
         "command_options": "-c id -f value"
       },

diff --git a/moonclient/moonclient/tests/tests_objects.json b/moonclient/moonclient/tests/tests_objects.json
index c3a70f4..10481d3 100644 (file)
--- a/moonclient/moonclient/tests/tests_objects.json
+++ b/moonclient/moonclient/tests/tests_objects.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -78,7 +78,7 @@
       {
         "name": "list_object",
         "command": "object list",
-        "result": "(?!$uuid_object)",
+        "no_result": "$uuid_object",
         "description": "Check that nova_server_1 object was deleted."
       },
       {
@@ -100,7 +100,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -207,7 +207,7 @@
       {
         "name": "list_object",
         "command": "object list",
-        "result": "(?!$uuid_object)",
+        "no_result": "$uuid_object",
         "description": "Check that nova_server_1 object was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_rules.json b/moonclient/moonclient/tests/tests_rules.json
index 5d3229b..6c22073 100644 (file)
--- a/moonclient/moonclient/tests/tests_rules.json
+++ b/moonclient/moonclient/tests/tests_rules.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -136,7 +136,7 @@
       {
         "name": "check_deleted_rule",
         "command": "rule list $submetarule_uuid",
-        "result": "(?!very_high)",
+        "no_result": "very_high",
         "description": "Check that the rule was correctly deleted.",
         "command_options": "-c s:subject_security_level -f value"
       },
@@ -151,7 +151,7 @@
       {
         "name": "list_intraextension_authz",
         "command": "intraextension list",
-        "result": "(?!$uuid_authz)",
+        "no_result": "$uuid_authz",
         "description": "Check the existence of that authz intra extension"
       },
       {
@@ -164,7 +164,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       }
     ],
@@ -172,7 +172,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -337,7 +337,7 @@
       {
         "name": "check_deleted_rule",
         "command": "rule list $submetarule_uuid",
-        "result": "(?!very_high)",
+        "no_result": "very_high",
         "description": "Check that the rule was correctly deleted.",
         "command_options": "-c s:subject_security_level -f value"
       },
@@ -352,7 +352,7 @@
       {
         "name": "list_intraextension_authz",
         "command": "intraextension list",
-        "result": "(?!$uuid_authz)",
+        "no_result": "$uuid_authz",
         "description": "Check the existence of that authz intra extension"
       },
       {
@@ -365,7 +365,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       }
     ]

diff --git a/moonclient/moonclient/tests/tests_subject_assignments.json b/moonclient/moonclient/tests/tests_subject_assignments.json
index 7eb1e82..d038c2c 100644 (file)
--- a/moonclient/moonclient/tests/tests_subject_assignments.json
+++ b/moonclient/moonclient/tests/tests_subject_assignments.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -57,7 +57,7 @@
       },
       {
         "name": "add_subject",
-        "command": "subject add alt_demo",
+        "command": "subject add alt_demo --password nomoresecrete",
         "result": "",
         "description": "Add the new subject category alt_demo",
         "command_options": ""
@@ -121,7 +121,7 @@
       {
         "name": "check_deleted_assignment",
         "command": "subject assignment list $uuid_subject $uuid_subject_category",
-        "result": "(?!$uuid_subject_scope)",
+        "no_result": "$uuid_subject_scope",
         "description": "Check deleted assignment.",
         "command_options": "-c id -f value"
       },
@@ -143,7 +143,7 @@
       {
         "name": "list_subject_category",
         "command": "subject category list",
-        "result": "(?!$uuid_subject_category)",
+        "no_result": "$uuid_subject_category",
         "description": "Check that my_new_subject_category subject_category was deleted."
       },
       {
@@ -165,7 +165,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -251,7 +251,7 @@
       },
       {
         "name": "add_subject",
-        "command": "subject add alt_demo",
+        "command": "subject add alt_demo --password nomoresecrete",
         "result": "",
         "description": "Add the new subject category alt_demo",
         "command_options": ""
@@ -315,7 +315,7 @@
       {
         "name": "check_deleted_assignment",
         "command": "subject assignment list $uuid_subject $uuid_subject_category",
-        "result": "(?!$uuid_subject_scope)",
+        "no_result": "$uuid_subject_scope",
         "description": "Check deleted assignment.",
         "command_options": "-c id -f value"
       },
@@ -337,7 +337,7 @@
       {
         "name": "list_subject_category",
         "command": "subject category list",
-        "result": "(?!$uuid_subject_category)",
+        "no_result": "$uuid_subject_category",
         "description": "Check that my_new_subject_category subject_category was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_subject_categories.json b/moonclient/moonclient/tests/tests_subject_categories.json
index 63bd349..54540f0 100644 (file)
--- a/moonclient/moonclient/tests/tests_subject_categories.json
+++ b/moonclient/moonclient/tests/tests_subject_categories.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -78,7 +78,7 @@
       {
         "name": "list_subject_category",
         "command": "subject category list",
-        "result": "(?!$uuid_subject_category)",
+        "no_result": "$uuid_subject_category",
         "description": "Check that my_new_subject_category subject_category was deleted."
       },
       {
@@ -100,7 +100,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -207,7 +207,7 @@
       {
         "name": "list_subject_category",
         "command": "subject category list",
-        "result": "(?!$uuid_subject_category)",
+        "no_result": "$uuid_subject_category",
         "description": "Check that my_new_subject_category subject_category was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_subject_scopes.json b/moonclient/moonclient/tests/tests_subject_scopes.json
index c6f7f30..218038c 100644 (file)
--- a/moonclient/moonclient/tests/tests_subject_scopes.json
+++ b/moonclient/moonclient/tests/tests_subject_scopes.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -86,7 +86,7 @@
       {
         "name": "check_deleted_scope",
         "command": "subject scope list $uuid_subject_category",
-        "result": "(?!$uuid_subject_scope)",
+        "no_result": "$uuid_subject_scope",
         "description": "Check deleted scope.",
         "command_options": "-c id -f value"
       },
@@ -109,7 +109,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -224,7 +224,7 @@
       {
         "name": "check_deleted_scope",
         "command": "subject scope list $uuid_subject_category",
-        "result": "(?!$uuid_subject_scope)",
+        "no_result": "$uuid_subject_scope",
         "description": "Check deleted scope.",
         "command_options": "-c id -f value"
       },

diff --git a/moonclient/moonclient/tests/tests_subjects.json b/moonclient/moonclient/tests/tests_subjects.json
index 37d37f4..db79367 100644 (file)
--- a/moonclient/moonclient/tests/tests_subjects.json
+++ b/moonclient/moonclient/tests/tests_subjects.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -78,7 +78,7 @@
       {
         "name": "list_subject",
         "command": "subject list",
-        "result": "(?!$uuid_subject)",
+        "no_result": "$uuid_subject",
         "description": "Check that alt_demo subject was deleted."
       },
       {
@@ -100,7 +100,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -207,7 +207,7 @@
       {
         "name": "list_subject",
         "command": "subject list",
-        "result": "(?!$uuid_subject)",
+        "no_result": "$uuid_subject",
         "description": "Check that alt_demo subject was deleted."
       },
       {

diff --git a/moonclient/moonclient/tests/tests_submetarules.json b/moonclient/moonclient/tests/tests_submetarules.json
index 955f628..d8b3e4d 100644 (file)
--- a/moonclient/moonclient/tests/tests_submetarules.json
+++ b/moonclient/moonclient/tests/tests_submetarules.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -109,7 +109,7 @@
       {
         "name": "list_intraextension_authz",
         "command": "intraextension list",
-        "result": "(?!$uuid_authz)",
+        "no_result": "$uuid_authz",
         "description": "Check the existence of that authz intra extension"
       },
       {
@@ -122,7 +122,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       }
     ],
@@ -130,7 +130,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       },
       {
@@ -268,7 +268,7 @@
       {
         "name": "list_intraextension_authz",
         "command": "intraextension list",
-        "result": "(?!$uuid_authz)",
+        "no_result": "$uuid_authz",
         "description": "Check the existence of that authz intra extension"
       },
       {
@@ -281,7 +281,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "Check if tenant alt_demo is used."
       }
     ]

diff --git a/moonclient/moonclient/tests/tests_tenants.json b/moonclient/moonclient/tests/tests_tenants.json
index 02b2075..c2674db 100644 (file)
--- a/moonclient/moonclient/tests/tests_tenants.json
+++ b/moonclient/moonclient/tests/tests_tenants.json
@@ -5,7 +5,7 @@
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "(?!alt_demo)",
+        "no_result": "alt_demo",
         "description": "List all tenants (must be empty)"
       },
       {