diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-09 16:59:49 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-13 09:15:51 +0200 |
| commit | 8981bd79eaa1863a74c7c0e41e56c9f501a5f75b (patch) | |
| tree | 81f0f6d91bdf4a891105f33bd6a496afa9313416 | |
| parent | 2c48dfc2b32c577c4754c2f1df2e6becc9bf5af3 (diff) | |
Remove the former results in DB url
It conforms generate_report.py with the previous change [1].
[1] https://gerrit.opnfv.org/gerrit/#/c/33511/
Conflicts:
functest/tests/unit/ci/test_generate_report.py
Change-Id: I677ebd416f462a591439fc7b637c02d7964e6173
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit a212763c3e9f4cf6d52200aa614e42a911c5dbf7)
| -rwxr-xr-x | functest/ci/generate_report.py | 6 | ||||
| -rw-r--r-- | functest/tests/unit/ci/test_generate_report.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/functest/ci/generate_report.py b/functest/ci/generate_report.py index 3872a07ed..1c844fabf 100755 --- a/functest/ci/generate_report.py +++ b/functest/ci/generate_report.py @@ -39,8 +39,8 @@ def init(tiers_to_run=[]): def get_results_from_db(): - url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), - CONST.BUILD_TAG) + url = "%s?build_tag=%s" % (ft_utils.get_db_url(), + CONST.BUILD_TAG) logger.debug("Query to rest api: %s" % url) try: data = json.load(urllib2.urlopen(url)) @@ -56,7 +56,7 @@ def get_data(test, results): for test_db in results: if test['test_name'] in test_db['case_name']: id = test_db['_id'] - url = ft_utils.get_db_url() + '/results/' + id + url = ft_utils.get_db_url() + '/' + id test_result = test_db['criteria'] return {"url": url, "result": test_result} diff --git a/functest/tests/unit/ci/test_generate_report.py b/functest/tests/unit/ci/test_generate_report.py index 2225586f2..5e7db52a1 100644 --- a/functest/tests/unit/ci/test_generate_report.py +++ b/functest/tests/unit/ci/test_generate_report.py @@ -28,16 +28,16 @@ class GenerateReportTesting(unittest.TestCase): @mock.patch('functest.ci.generate_report.urllib2.urlopen', side_effect=urllib2.URLError('no host given')) def test_get_results_from_db_fail(self, mock_method): - url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), - CONST.BUILD_TAG) + url = "%s?build_tag=%s" % (ft_utils.get_db_url(), + CONST.__getattribute__('BUILD_TAG')) self.assertIsNone(gen_report.get_results_from_db()) mock_method.assert_called_once_with(url) @mock.patch('functest.ci.generate_report.urllib2.urlopen', return_value={'results': []}) def test_get_results_from_db_success(self, mock_method): - url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), - CONST.BUILD_TAG) + url = "%s?build_tag=%s" % (ft_utils.get_db_url(), + CONST.__getattribute__('BUILD_TAG')) self.assertEqual(gen_report.get_results_from_db(), None) mock_method.assert_called_once_with(url) |