From c1c4cf5bf78a8d8b8cc5c49023d570d7569925b5 Mon Sep 17 00:00:00 2001 From: Jeremy Bowman Date: Fri, 24 May 2019 15:22:08 -0400 Subject: [PATCH] Remove more unused pa11ycrawler code (#20690) --- pavelib/paver_tests/test_paver_bok_choy_cmds.py | 6 ------ pavelib/utils/test/suites/bokchoy_suite.py | 5 ----- scripts/thresholds.sh | 2 +- scripts/xdist/get_worker_test_list.py | 6 +++--- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py index 08a2c9ab4dea..6477d5fde93b 100644 --- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py +++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py @@ -5,14 +5,8 @@ import os import unittest from test.test_support import EnvironmentVarGuard -from textwrap import dedent - -import ddt -from mock import Mock, call, patch -from paver.easy import call_task, environment from pavelib.utils.test.suites import BokChoyTestSuite -from pavelib.utils.test.suites.bokchoy_suite import DEMO_COURSE_IMPORT_DIR, DEMO_COURSE_TAR_GZ REPO_DIR = os.getcwd() diff --git a/pavelib/utils/test/suites/bokchoy_suite.py b/pavelib/utils/test/suites/bokchoy_suite.py index d9f17aee6364..aec231dc12dc 100644 --- a/pavelib/utils/test/suites/bokchoy_suite.py +++ b/pavelib/utils/test/suites/bokchoy_suite.py @@ -5,11 +5,9 @@ from __future__ import print_function import os from time import sleep -from textwrap import dedent from common.test.acceptance.fixtures.course import CourseFixture, FixtureError -from path import Path as path from paver.easy import sh, cmdopts, task, needs, might_call, call_task, dry from pavelib.utils.test.suites.suite import TestSuite from pavelib.utils.envs import Env @@ -35,9 +33,6 @@ DEFAULT_NUM_PROCESSES = 1 DEFAULT_VERBOSITY = 2 -DEMO_COURSE_TAR_GZ = "https://github.com/edx/demo-test-course/archive/master.tar.gz" -DEMO_COURSE_IMPORT_DIR = path('test_root/courses/') - @task @cmdopts([BOKCHOY_DEFAULT_STORE, BOKCHOY_DEFAULT_STORE_DEPR]) diff --git a/scripts/thresholds.sh b/scripts/thresholds.sh index bd730ffb4507..fde1c75365eb 100755 --- a/scripts/thresholds.sh +++ b/scripts/thresholds.sh @@ -2,6 +2,6 @@ set -e export LOWER_PYLINT_THRESHOLD=1000 -export UPPER_PYLINT_THRESHOLD=2200 +export UPPER_PYLINT_THRESHOLD=2100 export ESLINT_THRESHOLD=5530 export STYLELINT_THRESHOLD=880 diff --git a/scripts/xdist/get_worker_test_list.py b/scripts/xdist/get_worker_test_list.py index ea98294ec8d2..c6792d103b24 100644 --- a/scripts/xdist/get_worker_test_list.py +++ b/scripts/xdist/get_worker_test_list.py @@ -29,14 +29,14 @@ def main(log_file, test_suite): worker_test_dict = {} with io.open(log_file, 'r') as console_file: for line in console_file: - regex_search = re.search(r'\[{}] \[gw(\d+)] (PASSED|FAILED|SKIPPED|ERROR)'.format(test_suite), line) + regex_search = re.search(r'\[gw(\d+)] (PASSED|FAILED|SKIPPED|ERROR)'.format(test_suite), line) if regex_search: worker_num_string = regex_search.group(1) if worker_num_string not in worker_test_dict: worker_test_dict[worker_num_string] = [] - test = line.split()[3] + test = line.split()[2] if test_suite == "commonlib-unit": - if "pavelib" not in test: + if "pavelib" not in test and not test.startswith('scripts'): test = u"common/lib/{}".format(test) worker_test_dict[worker_num_string].append(test)