jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/832729 )
Change subject: [tests] Improvements for script_tests.py
......................................................................
[tests] Improvements for script_tests.py
- change auto_run_script_list to a set
- change _allowed_failures to a set
- use test_pattern to create test suite identifiers
Change-Id: Id504e4986d37a80b85db288801e98250d702098a
---
M tests/script_tests.py
1 file changed, 21 insertions(+), 24 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/script_tests.py b/tests/script_tests.py
index a086191..e22d409 100755
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -79,7 +79,7 @@
}
#:
-auto_run_script_list = [
+auto_run_script_set = {
'archivebot',
'blockpageschecker',
'category_redirect',
@@ -99,7 +99,7 @@
'upload',
'watchlist',
'welcome',
-]
+}
# Expected result for no arguments
# Some of these are not pretty, but at least they are informative
@@ -144,28 +144,25 @@
# Note: Raising SkipTest during load_tests will
# cause the loader to fallback to its own
# discover() ordering of unit tests.
-
if unrunnable_script_set:
unittest_print('Skipping execution of unrunnable scripts:\n {!r}'
.format(unrunnable_script_set))
+ test_pattern = 'tests.script_tests.TestScript{}.test_{}'
+
tests = ['_login'] + [name for name in sorted(script_list)
if name != 'login'
and name not in unrunnable_script_set]
- test_list = ['tests.script_tests.TestScriptHelp.test_' + name
- for name in tests]
+ test_list = [test_pattern.format('Help', name) for name in tests]
tests = [name for name in tests if name not in failed_dep_script_set]
- test_list += ['tests.script_tests.TestScriptSimulate.test_' + name
- for name in tests]
+ test_list += [test_pattern.format('Simulate', name) for name in tests]
- tests = [name for name in tests if name not in auto_run_script_list]
- test_list += ['tests.script_tests.TestScriptGenerator.test_' + name
- for name in tests]
+ tests = [name for name in tests if name not in auto_run_script_set]
+ test_list += [test_pattern.format('Generator', name) for name in tests]
- tests = loader.loadTestsFromNames(test_list)
suite = unittest.TestSuite()
- suite.addTests(tests)
+ suite.addTests(loader.loadTestsFromNames(test_list))
return suite
@@ -178,11 +175,11 @@
def import_script(script_name: str):
"""Import script for coverage only (T305795)."""
if not ci_test_run:
- return
+ return # pragma: no cover
+
+ prefix = 'scripts.'
if script_name in framework_scripts:
- prefix = 'pywikibot.scripts.'
- else:
- prefix = 'scripts.'
+ prefix = 'pywikibot.' + prefix
import_module(prefix + script_name)
@@ -197,7 +194,7 @@
args = []
is_autorun = ('-help' not in args
- and script_name in auto_run_script_list)
+ and script_name in auto_run_script_set)
def test_script(self):
global_args_msg = \
@@ -313,7 +310,7 @@
dct[test_name] = unittest.expectedFailure(dct[test_name])
elif script_name in dct['_allowed_failures']:
dct[test_name] = unittest.skip(
- '{} is in _allowed_failures list'
+ '{} is in _allowed_failures set'
.format(script_name))(dct[test_name])
elif script_name in failed_dep_script_set \
and arguments == '-simulate':
@@ -342,7 +339,7 @@
# Here come scripts requiring and missing dependencies, that haven't been
# fixed to output -help in that case.
_expected_failures = {'version'}
- _allowed_failures = []
+ _allowed_failures = set()
_arguments = '-help'
_results = None
@@ -371,19 +368,19 @@
'unusedfiles', # not localized for default sites
}
- _allowed_failures = [
+ _allowed_failures = {
'blockpageschecker', # not localized for some test sites
'disambredir',
'misspelling', # T94681
'noreferences',
'upload', # raises custom ValueError
'watchlist', # not logged in
- ]
+ }
_arguments = '-simulate'
_results = no_args_expected_results
_skip_results = skip_on_results
- _timeout = auto_run_script_list
+ _timeout = auto_run_script_set
class TestScriptGenerator(DefaultSiteTestCase, PwbTestCase,
@@ -420,7 +417,7 @@
'transferbot',
}
- _allowed_failures = [
+ _allowed_failures = {
'basic',
'commonscat',
'commons_information',
@@ -436,7 +433,7 @@
'solve_disambiguation',
'touch',
'weblinkchecker',
- ]
+ }
_arguments = '-simulate -page:Foo -always'
_results = ("Working on 'Foo", 'Script terminated successfully')
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/832729
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Id504e4986d37a80b85db288801e98250d702098a
Gerrit-Change-Number: 832729
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
