From 903389d7b76046141c92a720e9e515cc4bb46274 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Tue, 13 Jun 2017 15:41:58 +0530 Subject: [PATCH] Required mock package for python < 3.3. It was required for the commit: 1208206bc0eca2d135469258e8a209b983e668be Also, do not fetch the scenario-name, when it is not avaiable (but - use default vaule as the stringified test-case itself). --- requirements.txt | 3 ++- web/regression/runtests.py | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 605bedcb4..e915b95a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,4 +40,5 @@ SQLAlchemy==1.0.14 sqlparse==0.1.19 Werkzeug==0.9.6 WTForms==2.0.2 -backports.csv==1.0.4; python_version <= '2.7' \ No newline at end of file +backports.csv==1.0.4; python_version <= '2.7' +mock===2.0.0; python_version < '3.3' diff --git a/web/regression/runtests.py b/web/regression/runtests.py index 3ab75128a..3339cd619 100644 --- a/web/regression/runtests.py +++ b/web/regression/runtests.py @@ -223,13 +223,15 @@ def update_test_result(test_cases, test_result_dict): """ for test_case in test_cases: test_class_name = test_case[0].__class__.__name__ + test_scenario_name = getattr( + test_case[0], 'scenario_name', str(test_case[0]) + ) if test_class_name in test_result_dict: test_result_dict[test_class_name].append( - {test_case[0].scenario_name: test_case[1]}) + {test_scenario_name: test_case[1]}) else: test_result_dict[test_class_name] = \ - [{test_case[0].scenario_name: test_case[ - 1]}] + [{test_scenario_name: test_case[1]}] def get_tests_result(test_suite):