diff options
author | Ruan HE <ruan.he@orange.com> | 2015-11-25 15:10:23 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-25 15:10:23 +0000 |
commit | 37bfc828e629714733320cd32ce2ec1f7f5dc845 (patch) | |
tree | c816aa68529a8b1948fcec9f3282ec9c38ff2e27 /moonclient/moonclient/tests.py | |
parent | fbdd3c6adc86353861fc48a8534523f85356b0cc (diff) | |
parent | 5a6c85a046dccc21752e4aa52670a5f22c231c18 (diff) |
Merge "Add a "no_result" key in JSON test files because "(?!...)" regular expression doesn't work as expected."
Diffstat (limited to 'moonclient/moonclient/tests.py')
-rw-r--r-- | moonclient/moonclient/tests.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/moonclient/moonclient/tests.py b/moonclient/moonclient/tests.py index e85c276b..24732db5 100644 --- 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" |