From 4ea05a22c033413b0f2443519444980dcc93ab71 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Mon, 8 Oct 2018 11:38:49 -0700 Subject: [PATCH] fix couple more flake8 issues Signed-off-by: Vasu Kulkarni --- teuthology/gencov.py | 111 +++++++++++++-------------- teuthology/test/task/test_install.py | 8 +- 2 files changed, 56 insertions(+), 63 deletions(-) diff --git a/teuthology/gencov.py b/teuthology/gencov.py index 09e81a3a58..cbacb7de78 100644 --- a/teuthology/gencov.py +++ b/teuthology/gencov.py @@ -1,77 +1,74 @@ import os -import sys import logging import subprocess import shlex import coverage_report -log=logging.getLogger() -hdlr=logging.FileHandler('/a/code_coverage_logs/coverage.log') +log = logging.getLogger() +hdlr = logging.FileHandler('/a/code_coverage_logs/coverage.log') formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') hdlr.setFormatter(formatter) log.addHandler(hdlr) log.setLevel(logging.INFO) -def generate_coverage_compile(cover_dir): - log.info("Inside generate_coverage_compile") - merged_total=cover_dir+"/total.info" - filtered_total=cover_dir+"/filtered_total.info" -# cmd="lcov --rc lcov_branch_coverage=1 " - cmd="lcov " - ilist=os.listdir(cover_dir) - for ent in ilist: - if '*.info' in ent: - subprocess.Popen( - args=[ - 'sed', '-i','s/\/sourcebuild/\/tmp\/build\/{}/'.format(\ - os.path.basename(cover_dir)), \ - cover_dir+"/"+ent] - ) - for ent in ilist: - if 'info' in ent: - addstr= " -a " + cover_dir+"/"+ent - tstr=" -t "+ ent.split("_")[0] - cmd = cmd + addstr+tstr - log.info(cmd) - cmd=cmd + " -o "+ merged_total - log.info(cmd) - proc=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE) - proc_stdout=proc.communicate()[0] - log.info(proc_stdout) - assert(os.path.exists(merged_total)) +def generate_coverage_compile(cover_dir): + log.info("Inside generate_coverage_compile") + merged_total = cover_dir + "/total.info" + filtered_total = cover_dir + "/filtered_total.info" + cmd = "lcov " + ilist = os.listdir(cover_dir) + for ent in ilist: + if '*.info' in ent: + subprocess.Popen( + args=[ + 'sed', '-i', 's/\/sourcebuild/\/tmp\/build\/{}/'.format( + os.path.basename(cover_dir)), + cover_dir + "/" + ent] + ) - proc=subprocess.Popen( - args=[ - 'sed', '-i','s/\/sourcebuild/\/tmp\/build\/{}/'.format(\ - os.path.basename(cover_dir)), \ - merged_total] - ) - proc_stdout=proc.communicate()[0] - log.info(proc_stdout) + for ent in ilist: + if 'info' in ent: + addstr = " -a " + cover_dir + "/" + ent + tstr = " -t " + ent.split("_")[0] + cmd = cmd + addstr + tstr + log.info(cmd) + cmd = cmd + " -o " + merged_total + log.info(cmd) + proc = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE) + proc_stdout = proc.communicate()[0] + log.info(proc_stdout) + assert(os.path.exists(merged_total)) - cmd="lcov --remove "+merged_total+" '/usr/include/*' '/usr/lib/*' " +\ - " -o "+ filtered_total - log.info(cmd) - proc=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE) - proc_stdout=proc.communicate()[0] - log.info(proc_stdout) - assert(os.path.exists(filtered_total)) + proc = subprocess.Popen( + args=[ + 'sed', '-i', 's/\/sourcebuild/\/tmp\/build\/{}/'.format( + os.path.basename(cover_dir)), + merged_total] + ) + proc_stdout = proc.communicate()[0] + log.info(proc_stdout) - cmd="genhtml " + " -o "+cover_dir+" {}".format(filtered_total) - log.info(cmd) - proc=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE) - proc_stdout=proc.communicate()[0] - log.info(proc_stdout) - assert(os.path.exists(cover_dir+"/index.html")) + cmd = "lcov --remove " + merged_total + \ + " '/usr/include/*' '/usr/lib/*' " + " -o " + filtered_total + log.info(cmd) + proc = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE) + proc_stdout = proc.communicate()[0] + log.info(proc_stdout) + assert(os.path.exists(filtered_total)) + cmd = "genhtml " + " -o " + cover_dir + " {}".format(filtered_total) + log.info(cmd) + proc = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE) + proc_stdout = proc.communicate()[0] + log.info(proc_stdout) + assert(os.path.exists(cover_dir + "/index.html")) def main(args): - log = logging.getLogger(__name__) - basedir="/a/code_coverage_logs/" - coverdir=basedir+args[''] - generate_coverage_compile(coverdir) - gen_path="/a/code_coverage_logs/" - coverage_report.gen_html(gen_path, 10) + basedir = "/a/code_coverage_logs/" + coverdir = basedir + args[''] + generate_coverage_compile(coverdir) + gen_path = "/a/code_coverage_logs/" + coverage_report.gen_html(gen_path, 10) diff --git a/teuthology/test/task/test_install.py b/teuthology/test/task/test_install.py index 7e3df52490..bc98196754 100644 --- a/teuthology/test/task/test_install.py +++ b/teuthology/test/task/test_install.py @@ -302,7 +302,6 @@ class TestInstall(object): } assert install.upgrade_remote_to_config(ctx, config) == expected_config - @patch("teuthology.task.install.packaging.get_package_version") @patch("teuthology.task.install.redhat.set_deb_repo") def test_rh_install_deb_pkgs(self, m_set_rh_deb_repo, m_get_pkg_version): @@ -311,13 +310,10 @@ class TestInstall(object): version = '1.3.2' rh_ds_yaml = dict() rh_ds_yaml = {'versions': {'deb': {'mapped': {'1.3.2': '0.94.5'}}}, - 'pkgs': { 'deb': ['pkg1', 'pkg2'] }} + 'pkgs': {'deb': ['pkg1', 'pkg2']}} m_get_pkg_version.return_value = "0.94.5" - deb_repo=Mock() - deb_gpg_key=Mock() install.redhat.install_deb_pkgs(ctx, remote, version, rh_ds_yaml) - @patch("teuthology.task.install.packaging.get_package_version") def test_rh_install_pkgs(self, m_get_pkg_version): ctx = Mock() @@ -326,7 +322,7 @@ class TestInstall(object): rh_ds_yaml = dict() rh_ds_yaml = {'versions': {'rpm': {'mapped': {'1.3.2': '0.94.5', '1.3.1': '0.94.3'}}}, - 'pkgs': { 'rpm': ['pkg1', 'pkg2'] }} + 'pkgs': {'rpm': ['pkg1', 'pkg2']}} m_get_pkg_version.return_value = "0.94.5" install.redhat.install_pkgs(ctx, remote, version, rh_ds_yaml) version = '1.3.1' -- 2.39.5