jenkins-bot has submitted this change and it was merged.
Change subject: Deadlock problem fixed by using requests
......................................................................
Deadlock problem fixed by using requests
Bug: T71781
Change-Id: Iae9454cc0c7d4c815b2d9def7a8510d9d38f24e3
---
M scripts/makecat.py
M tests/script_tests.py
2 files changed, 3 insertions(+), 16 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/makecat.py b/scripts/makecat.py
index b2885f5..d1a80f9 100755
--- a/scripts/makecat.py
+++ b/scripts/makecat.py
@@ -194,7 +194,7 @@
main = True
workingcatname = ''
tocheck = DequeGenerator()
- for arg in pywikibot.handleArgs():
+ for arg in pywikibot.handle_args():
if arg.startswith('-nodate'):
skipdates = True
elif arg.startswith('-forward'):
diff --git a/tests/script_tests.py b/tests/script_tests.py
index bf11a8b..f93d126 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -66,10 +66,6 @@
'script_wui', # depends on lua compiling
]
-deadlock_script_list = [
- 'makecat', # bug 69781
-]
-
script_list = (['login'] +
[name[0:-3] for name in os.listdir(scripts_path) # strip '.py'
if name.endswith('.py') and
@@ -173,10 +169,6 @@
# cause the loader to fallback to its own
# discover() ordering of unit tests.
- if deadlock_script_list:
- print('Skipping deadlock scripts:\n %s'
- % ', '.join(deadlock_script_list))
-
if unrunnable_script_list:
print('Skipping execution of unrunnable scripts:\n %r'
% unrunnable_script_list)
@@ -189,14 +181,12 @@
tests = (['test__login_help'] +
['test_' + name + '_help'
for name in sorted(script_list)
- if name != 'login' and
- name not in deadlock_script_list] +
+ if name != 'login'] +
['test__login_simulate'])
tests += ['test_' + name + '_simulate'
for name in sorted(script_list)
if name != 'login' and
- name not in deadlock_script_list and
name not in failed_dep_script_list and
name not in unrunnable_script_list and
(enable_autorun_tests or name not in auto_run_script_list)]
@@ -343,9 +333,6 @@
# TODO: after bug 68611 and 68664 (and makecat), split -help
# execution to a separate test class which uses site=False.
- if script_name in deadlock_script_list:
- dct[test_name].__test__ = False
-
if script_name == 'login':
test_name = 'test__' + script_name + '_simulate'
else:
@@ -372,7 +359,7 @@
dct[test_name].__name__ = test_name
# Disable test by default in nosetests
- if script_name in unrunnable_script_list + deadlock_script_list:
+ if script_name in unrunnable_script_list:
dct[test_name].__test__ = False
# TODO: Ideally any script not on the auto_run_script_list
--
To view, visit https://gerrit.wikimedia.org/r/216407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae9454cc0c7d4c815b2d9def7a8510d9d38f24e3
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: XZise <commodorefabia...@gmx.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
