diff --git a/fuelweb_test/testrail/builds.py b/fuelweb_test/testrail/builds.py index 4019bfec2..5c2598042 100644 --- a/fuelweb_test/testrail/builds.py +++ b/fuelweb_test/testrail/builds.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import json import re diff --git a/fuelweb_test/testrail/generate_statistics.py b/fuelweb_test/testrail/generate_statistics.py index f924d983f..951401342 100644 --- a/fuelweb_test/testrail/generate_statistics.py +++ b/fuelweb_test/testrail/generate_statistics.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import json import os import re @@ -181,8 +183,7 @@ class TestRunStatistics(object): self.run['name'], self.run['config'] or 'default config')) for test in self.tests: - logger.debug('Checking "{0}" test...'.format( - test['title'].encode('utf8'))) + logger.debug('Checking "{0}" test...'.format(test['title'])) test_results = sorted( self.project.get_results_for_test(test['id'], self.results), key=lambda x: x['id'], reverse=True) @@ -359,7 +360,7 @@ class StatisticsGenerator(object): index = 1 for tid, params in values['tests'].items(): if index > 1: - link_text = str(index) + link_text = '{}'.format(index) else: link_text = '{0} on {1}'.format(params['group'], params['config']) @@ -396,7 +397,7 @@ class StatisticsGenerator(object): index = 1 for tid, params in values['tests'].items(): if index > 1: - link_text = str(index) + link_text = '{}'.format(index) else: link_text = '{0} on {1}'.format(params['group'], params['config']) diff --git a/fuelweb_test/testrail/report.py b/fuelweb_test/testrail/report.py index db9fb8e7c..742ede4c8 100755 --- a/fuelweb_test/testrail/report.py +++ b/fuelweb_test/testrail/report.py @@ -15,6 +15,7 @@ # under the License. from __future__ import division +from __future__ import unicode_literals import functools import re diff --git a/fuelweb_test/testrail/report_pi.py b/fuelweb_test/testrail/report_pi.py index 68a8a812f..7b82d03c3 100644 --- a/fuelweb_test/testrail/report_pi.py +++ b/fuelweb_test/testrail/report_pi.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import json from logging import DEBUG diff --git a/fuelweb_test/testrail/report_tempest_results.py b/fuelweb_test/testrail/report_tempest_results.py index a288b974d..b1a8b0c5f 100644 --- a/fuelweb_test/testrail/report_tempest_results.py +++ b/fuelweb_test/testrail/report_tempest_results.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import optparse from xml.etree import ElementTree diff --git a/fuelweb_test/testrail/settings.py b/fuelweb_test/testrail/settings.py index be7fd3506..98608e938 100644 --- a/fuelweb_test/testrail/settings.py +++ b/fuelweb_test/testrail/settings.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import logging import os diff --git a/fuelweb_test/testrail/testrail.py b/fuelweb_test/testrail/testrail.py index eff39a310..4e00e8293 100644 --- a/fuelweb_test/testrail/testrail.py +++ b/fuelweb_test/testrail/testrail.py @@ -23,6 +23,8 @@ # Copyright Gurock Software GmbH. See license.md for details. # +from __future__ import unicode_literals + import base64 import json import time @@ -114,8 +116,8 @@ class APIClient(object): if method == 'POST': request.add_data(json.dumps(data)) auth = base64.encodestring( - '%s:%s' % (self.user, self.password)).strip() - request.add_header('Authorization', 'Basic %s' % auth) + '{0}:{1}'.format(self.user, self.password)).strip() + request.add_header('Authorization', 'Basic {}'.format(auth)) request.add_header('Content-Type', 'application/json') e = None diff --git a/fuelweb_test/testrail/testrail_client.py b/fuelweb_test/testrail/testrail_client.py index d11d710f7..870b69e44 100644 --- a/fuelweb_test/testrail/testrail_client.py +++ b/fuelweb_test/testrail/testrail_client.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + from fuelweb_test.testrail.settings import logger from fuelweb_test.testrail.testrail import APIClient from fuelweb_test.testrail.testrail import APIError diff --git a/fuelweb_test/testrail/upload_cases_description.py b/fuelweb_test/testrail/upload_cases_description.py index 1c3fe8bf1..6089e88c7 100644 --- a/fuelweb_test/testrail/upload_cases_description.py +++ b/fuelweb_test/testrail/upload_cases_description.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import re from logging import DEBUG diff --git a/fuelweb_test/testrail/upload_tempest_test_suite.py b/fuelweb_test/testrail/upload_tempest_test_suite.py index 3f1b8d6fe..9d092ab8d 100644 --- a/fuelweb_test/testrail/upload_tempest_test_suite.py +++ b/fuelweb_test/testrail/upload_tempest_test_suite.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import subprocess from joblib import Parallel, delayed