diff options
Diffstat (limited to 'moonclient')
-rw-r--r-- | moonclient/moonclient/metarules.py | 4 | ||||
-rw-r--r-- | moonclient/moonclient/tests.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/moonclient/moonclient/metarules.py b/moonclient/moonclient/metarules.py index 9677c5f6..a980cd85 100644 --- a/moonclient/moonclient/metarules.py +++ b/moonclient/moonclient/metarules.py @@ -84,8 +84,8 @@ class AggregationAlgorithmSet(Command): authtoken=True) algorithm = self.__get_aggregation_algorithm_from_id(data['content']) return ( - ("id", "name", "description"), - ((data['content'], algorithm["name"], algorithm["description"]), ) + ("id",), + (algorithm,) ) diff --git a/moonclient/moonclient/tests.py b/moonclient/moonclient/tests.py index dd0dd7de..a97ba61c 100644 --- a/moonclient/moonclient/tests.py +++ b/moonclient/moonclient/tests.py @@ -102,8 +102,12 @@ class TestsLaunch(Lister): 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 error_str: - compare = "\033[1m\033[31mFalse\033[m" - overall_result = False + if compare: + compare = "\033[33mTrue\033[m" + overall_result = True + else: + compare = "\033[1m\033[31mFalse\033[m" + overall_result = False else: overall_result = overall_result and compare if compare: |