From 9c00f73114269e7f3fd4272358c8c6ec9fffe311 Mon Sep 17 00:00:00 2001 From: Milosz Wasilewski Date: Tue, 4 Aug 2020 10:29:35 +0100 Subject: plans: support python3 in testplan2html.py Signed-off-by: Milosz Wasilewski --- plans/testplan2html.py | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'plans') diff --git a/plans/testplan2html.py b/plans/testplan2html.py index 52c0e36..ba5ee8c 100644 --- a/plans/testplan2html.py +++ b/plans/testplan2html.py @@ -1,5 +1,6 @@ import collections import datetime +import logging import os import subprocess import yaml @@ -8,24 +9,14 @@ from csv import DictWriter from jinja2 import Environment, FileSystemLoader -class PrependOrderedDict(collections.OrderedDict): +logger = logging.getLogger() - def prepend(self, key, value, dict_setitem=dict.__setitem__): - root = self._OrderedDict__root - first = root[1] +class PrependOrderedDict(collections.OrderedDict): - if key in self: - link = self._OrderedDict__map[key] - link_prev, link_next, _ = link - link_prev[1] = link_next - link_next[0] = link_prev - link[0] = root - link[1] = first - root[1] = first[0] = link - else: - root[1] = first[0] = self._OrderedDict__map[key] = [root, first, key] - dict_setitem(self, key, value) + def prepend(self, key, value, dict_setitem=dict.__setitem__): + self[key] = value + self.move_to_end(key, last=False) def render(obj, template="testplan.html", name=None): @@ -84,7 +75,7 @@ def test_exists(test, repositories, args): test['path'] ) current_dir = os.getcwd() - print current_dir + logger.debug("Current dir: {}".format(current_dir)) os.chdir(repositories[test['repository']]) if 'revision' in test.keys(): subprocess.call(['git', 'checkout', test['revision']]) @@ -102,22 +93,22 @@ def test_exists(test, repositories, args): test['missing'] = False # open the file and render the test subprocess.call(['git', 'checkout', 'master']) - print current_dir + logger.debug("Current dir: {}".format(current_dir)) os.chdir(current_dir) - print os.getcwd() + logger.debug("CWD: {}".format(os.getcwd())) test_file = open(test_file_path, "r") test_yaml = yaml.load(test_file.read(), Loader=yaml.FullLoader) params_string = "" if 'parameters' in test.keys(): - params_string = "_".join(["{0}-{1}".format(param_name, param_value).replace("/", "").replace(" ", "") for param_name, param_value in test['parameters'].iteritems()]) + params_string = "_".join(["{0}-{1}".format(param_name, param_value).replace("/", "").replace(" ", "") for param_name, param_value in test['parameters'].items()]) test_yaml['params'].update(test['parameters']) if args.single_output: # update parameters in test if 'params' in test_yaml.keys(): - for param_name, param_value in test_yaml['params'].iteritems(): + for param_name, param_value in test_yaml['params'].items(): if param_name not in test['parameters'].keys(): test['parameters'].update({param_name: param_value}) - print params_string + logger.debug("PARAM strings: {}".format(params_string)) test_name = "{0}_{1}.html".format(test_yaml['metadata']['name'], params_string) if not args.single_output: test['filename'] = test_name @@ -239,7 +230,7 @@ def main(): args = parser.parse_args() if not os.path.exists(os.path.abspath(args.output)): - os.makedirs(os.path.abspath(args.output), 0755) + os.makedirs(os.path.abspath(args.output), mode=0o755) for testplan in args.testplan_list: if os.path.exists(testplan) and os.path.isfile(testplan): testplan_file = open(testplan, "r") -- cgit v1.2.3