diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2017-04-19 02:21:14 -0400 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-13 09:10:29 +0200 |
| commit | 4af24ab61703bca05a37c062388390ac82d5c96e (patch) | |
| tree | bb72ff46bd97978b124564b49815a2594713738d | |
| parent | 66331529e5e897873ff157c461259c3186be36e3 (diff) | |
Stop hardcoding results suffix in push_to_db
Adding results in url is useless as it is defined in results
section in config_functest.yaml.
It allows defining the full name in case of dumping to file (see
decorator.py). The commented local file is the value required by
dovetail.
Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I35ba9b34d99e138292f099934e28585ee8b85604
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 7e15dbb5136b1b298d86a82c03199bf1f7a6fe46)
| -rwxr-xr-x | functest/ci/config_functest.yaml | 6 | ||||
| -rw-r--r-- | functest/utils/decorators.py | 5 | ||||
| -rw-r--r-- | functest/utils/functest_utils.py | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 78f6257c8..771817b88 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -200,6 +200,6 @@ example: sg_desc: Example Security group results: - # you can also set a dir (e.g. /home/opnfv/db) to dump results - # test_db_url: file:///home/opnfv/db - test_db_url: http://testresults.opnfv.org/test/api/v1 + # you can also set a file (e.g. /home/opnfv/functest/results/dump.txt) to dump results + # test_db_url: file:///home/opnfv/functest/results/dump.txt + test_db_url: http://testresults.opnfv.org/test/api/v1/results diff --git a/functest/utils/decorators.py b/functest/utils/decorators.py index 276235d96..2ca31066d 100644 --- a/functest/utils/decorators.py +++ b/functest/utils/decorators.py @@ -13,11 +13,12 @@ def can_dump_request_to_file(method): parseresult = urlparse.urlparse(request.url) if parseresult.scheme == "file": try: - os.makedirs(parseresult.path) + dirname = os.path.dirname(parseresult.path) + os.makedirs(dirname) except OSError as e: if e.errno != errno.EEXIST: raise - with open(os.path.join(parseresult.path, 'dump.txt'), 'a') as f: + with open(parseresult.path, 'a') as f: headers = "" for key in request.headers: headers += key + " " + request.headers[key] + "\n" diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index 7cc5029d9..48682718d 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -197,7 +197,7 @@ def push_results_to_db(project, case_name, POST results to the Result target DB """ # Retrieve params from CI and conf - url = get_db_url() + "/results" + url = get_db_url() try: installer = os.environ['INSTALLER_TYPE'] |