diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-12-02 08:30:47 +0100 |
|---|---|---|
| committer | Morgan Richomme <morgan.richomme@orange.com> | 2016-12-05 14:14:14 +0100 |
| commit | d13fac5935bb3fe573dc9a79e06b8cffde37712e (patch) | |
| tree | 0333a6fd3380a1e85180591641a61597797ed8f7 /functest/ci | |
| parent | dc733c31177b0ffdc4c30b9c4801b765909f1c50 (diff) | |
Fix Pep8 issues related to \
JIRA: FUNCTEST-630
Change-Id: I2b6d3bec67c6fe290fb2ad795a54a2dd2e3c7a0b
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Diffstat (limited to 'functest/ci')
| -rwxr-xr-x | functest/ci/generate_report.py | 4 | ||||
| -rwxr-xr-x | functest/ci/prepare_env.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/functest/ci/generate_report.py b/functest/ci/generate_report.py index 9ae9dca5..a90bc555 100755 --- a/functest/ci/generate_report.py +++ b/functest/ci/generate_report.py @@ -41,8 +41,8 @@ def init(tiers_to_run): def get_results_from_db(): - url = ft_utils.get_db_url() + '/results?build_tag=' \ - + GlobalVariables.BUILD_TAG + url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), + GlobalVariables.BUILD_TAG) logger.debug("Query to rest api: %s" % url) try: data = json.load(urllib2.urlopen(url)) diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index 246a02a8..3a99d3ba 100755 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -124,8 +124,7 @@ def source_rc_file(): logger.warning("The environment variable 'creds' must be set and" "pointing to the local RC file. Using default: " "/home/opnfv/functest/conf/openstack.creds ...") - ft_constants.OPENSTACK_CREDS = \ - "/home/opnfv/functest/conf/openstack.creds" + os.path.join(ft_constants.FUNCTEST_CONF_DIR, 'openstack.creds') if not os.path.isfile(ft_constants.OPENSTACK_CREDS): logger.info("RC file not provided. " |