Pywikibot-commits August 2015

pywikibot-commits@lists.wikimedia.org

2 participants
240 discussions

[Gerrit] [IMPROV] Fix indentation errors E122 and E127 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Fix indentation errors E122 and E127 ...................................................................... [IMPROV] Fix indentation errors E122 and E127 This also adds docstrings to all methods of the replace script also adding it to the mandatory list of the tox file. Change-Id: I7348bf135cdb9ea4ef24677f8de359ba717200a9 --- M docs/conf.py M pywikibot/data/wikidataquery.py M pywikibot/flow.py M scripts/replace.py M tox.ini 5 files changed, 35 insertions(+), 25 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 64c3114..d1263ad 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -175,16 +175,7 @@ # -- Options for LaTeX output -------------------------------------------------- -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -# 'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -# 'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -# 'preamble': '', -} +latex_elements = {} # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). diff --git a/pywikibot/data/wikidataquery.py b/pywikibot/data/wikidataquery.py index 8a40510..59cb48a 100644 --- a/pywikibot/data/wikidataquery.py +++ b/pywikibot/data/wikidataquery.py @@ -340,14 +340,14 @@ def validate(self): """Validate that the item, forward and reverse are all ints.""" return (self.isOrContainsOnlyTypes(self.item, int) and - self.isOrContainsOnlyTypes(self.forward, int) and - self.isOrContainsOnlyTypes(self.reverse, int)) + self.isOrContainsOnlyTypes(self.forward, int) and + self.isOrContainsOnlyTypes(self.reverse, int)) def __str__(self): """Return the query string for the API.""" return "%s[%s][%s][%s]" % (self.queryType, self.formatList(self.item), - self.formatList(self.forward), - self.formatList(self.reverse)) + self.formatList(self.forward), + self.formatList(self.reverse)) class Around(Query): @@ -474,7 +474,7 @@ """ def __init__(self, host="https://wdq.wmflabs.org", cacheDir=None, - cacheMaxAge=60): + cacheMaxAge=60): """Constructor.""" self.host = host self.cacheMaxAge = cacheMaxAge @@ -483,7 +483,7 @@ self.cacheDir = cacheDir else: self.cacheDir = os.path.join(tempfile.gettempdir(), - "wikidataquery_cache") + "wikidataquery_cache") def getUrl(self, queryStr): """Get the URL given the query string.""" @@ -535,7 +535,7 @@ data = pickle.load(f) except pickle.UnpicklingError: pywikibot.warning(u"Couldn't read cached data from %s" - % cacheFile) + % cacheFile) data = None return data diff --git a/pywikibot/flow.py b/pywikibot/flow.py index f9ba1fc..27c59ce 100644 --- a/pywikibot/flow.py +++ b/pywikibot/flow.py @@ -104,8 +104,8 @@ return new_params def topics(self, format='wikitext', limit=100, sort_by='newest', - offset=None, offset_uuid='', reverse=False, - include_offset=False, toc_only=False): + offset=None, offset_uuid='', reverse=False, + include_offset=False, toc_only=False): """Load this board's topics. @param format: The content format to request the data in. diff --git a/scripts/replace.py b/scripts/replace.py index 6c5e97c..aa3b6ed 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -166,6 +166,7 @@ def precompile_exceptions(exceptions, use_regex, flags): + """Compile the exceptions with the given flags.""" if not exceptions: return for exceptionCategory in [ @@ -183,6 +184,7 @@ """The replacement instructions.""" def __init__(self, old, new, edit_summary=None, default_summary=True): + """Create a basic replacement instance.""" self.old = old self.old_regex = None self.new = new @@ -191,6 +193,7 @@ @property def edit_summary(self): + """Return the edit summary for this fix.""" return self._edit_summary @property @@ -219,6 +222,7 @@ return None def _compile(self, use_regex, flags): + """Compile the search text without modifying the flags.""" # This does not update use_regex and flags depending on this instance if not use_regex: self.old_regex = re.escape(self.old) @@ -227,6 +231,7 @@ self.old_regex = re.compile(self.old_regex, flags) def compile(self, use_regex, flags): + """Compile the search text.""" # Set the regular expression flags flags |= re.UNICODE @@ -247,6 +252,7 @@ def __init__(self, old, new, use_regex=None, exceptions=None, case_insensitive=None, edit_summary=None, default_summary=True): + """Create a single replacement entry unrelated to a fix.""" super(Replacement, self).__init__(old, new, edit_summary, default_summary) self._use_regex = use_regex @@ -264,13 +270,16 @@ @property def case_insensitive(self): + """Return whether the search text is case insensitive.""" return self._case_insensitive @property def use_regex(self): + """Return whether the search text is using regex.""" return self._use_regex def _compile(self, use_regex, flags): + """Compile the search regex and exceptions.""" super(Replacement, self)._compile(use_regex, flags) precompile_exceptions(self.exceptions, use_regex, flags) @@ -291,6 +300,7 @@ def __init__(self, use_regex, exceptions, case_insensitive, edit_summary, name): + """Create a fix list which can contain multiple replacements.""" super(ReplacementList, self).__init__() self.use_regex = use_regex self._exceptions = exceptions @@ -300,6 +310,7 @@ self.name = name def _compile_exceptions(self, use_regex, flags): + """Compile the exceptions if not already done.""" if not self.exceptions and self._exceptions is not None: self.exceptions = dict(self._exceptions) precompile_exceptions(self.exceptions, use_regex, flags) @@ -311,24 +322,29 @@ def __init__(self, old, new, fix_set, edit_summary=None, default_summary=True): + """Create a replacement entry inside a fix set.""" super(ReplacementListEntry, self).__init__(old, new, edit_summary, default_summary) self.fix_set = fix_set @property def case_insensitive(self): + """Return whether the fix set is case insensitive.""" return self.fix_set.case_insensitive @property def use_regex(self): + """Return whether the fix set is using regex.""" return self.fix_set.use_regex @property def exceptions(self): + """Return the exceptions of the fix set.""" return self.fix_set.exceptions @property def edit_summary(self): + """Return this entry's edit summary or the fix's summary.""" if self._edit_summary is None: return self.fix_set.edit_summary else: @@ -348,6 +364,7 @@ return self.fix_set def _compile(self, use_regex, flags): + """Compile the search regex and the fix's exceptions.""" super(ReplacementListEntry, self)._compile(use_regex, flags) self.fix_set._compile_exceptions(use_regex, flags) @@ -504,7 +521,7 @@ if len(replacement) != 2: raise ValueError('Replacement number {0} does not have ' 'exactly two elements: {1}'.format( - i, replacement)) + i, replacement)) # Replacement assumes it gets strings but it's already compiled replacements[i] = Replacement.from_compiled(replacement[0], replacement[1]) @@ -602,6 +619,7 @@ return new_text def doReplacements(self, original_text, page=None): + """Apply replacements to the given text and page.""" if page is None: pywikibot.warn( 'You must pass the target page as the "page" parameter to ' @@ -978,12 +996,12 @@ if chars.contains_invisible(replacement[0]): pywikibot.warning('The old string "{0}" contains formatting ' 'characters like U+200E'.format( - chars.replace_invisible(replacement[0]))) + chars.replace_invisible(replacement[0]))) if (not callable(replacement[1]) and chars.contains_invisible(replacement[1])): pywikibot.warning('The new string "{0}" contains formatting ' 'characters like U+200E'.format( - chars.replace_invisible(replacement[1]))) + chars.replace_invisible(replacement[1]))) replacement_set.append(ReplacementListEntry( old=replacement[0], new=replacement[1], diff --git a/tox.ini b/tox.ini index dcac433..6a052c3 100644 --- a/tox.ini +++ b/tox.ini @@ -31,6 +31,7 @@ [testenv:flake8-docstrings-mandatory] commands = flake8 \ + docs/conf.py \ ez_setup.py \ generate_user_files.py \ pwb.py \ @@ -42,13 +43,12 @@ pywikibot/compat/ \ pywikibot/config2.py \ pywikibot/daemonize.py \ - pywikibot/data/__init__.py \ - pywikibot/data/api.py \ - pywikibot/data/wikistats.py \ + pywikibot/data/ \ pywikibot/diff.py \ pywikibot/echo.py \ pywikibot/editor.py \ pywikibot/exceptions.py \ + pywikibot/flow.py \ pywikibot/interwiki_graph.py \ pywikibot/families/ \ pywikibot/fixes.py \ @@ -109,6 +109,7 @@ scripts/patrol.py \ scripts/piper.py \ scripts/protect.py \ + scripts/replace.py \ scripts/selflink.py \ scripts/shell.py \ scripts/spamremove.py \ -- To view, visit https://gerrit.wikimedia.org/r/231887 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7348bf135cdb9ea4ef24677f8de359ba717200a9 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Mattflaschen <mflaschen(a)wikimedia.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Fix missing i18n git submodule on Python 3 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix missing i18n git submodule on Python 3 ...................................................................... Fix missing i18n git submodule on Python 3 Avoid implicit namespace package in messages_available() and twget_keys(). Raise OSError in twget_keys() when i18n can not be loaded. Bug: T110174 Change-Id: I7454bb13d499661e1467227e06a3d57286cb1dd0 --- M pywikibot/i18n.py 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index de78688..9607c87 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -81,8 +81,12 @@ if _messages_available is not None: return _messages_available try: - __import__(_messages_package_name) + mod = __import__(_messages_package_name, fromlist=[str('__path__')]) except ImportError: + _messages_available = False + return False + + if not os.listdir(next(iter(mod.__path__))): _messages_available = False return False @@ -612,11 +616,13 @@ Return all language codes for a special message. @param twtitle: The TranslateWiki string title, in <package>-<key> format + + @raises OSError: the package i18n can not be loaded """ # obtain the directory containing all the json files for this package package = twtitle.split("-")[0] mod = __import__(_messages_package_name, fromlist=[str('__file__')]) - pathname = os.path.join(os.path.dirname(mod.__file__), package) + pathname = os.path.join(next(iter(mod.__path__)), package) # build a list of languages in that directory langs = [filename.partition('.')[0] -- To view, visit https://gerrit.wikimedia.org/r/233688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7454bb13d499661e1467227e06a3d57286cb1dd0 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Use oauth on beta en.wp and add beta en.ws - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Use oauth on beta en.wp and add beta en.ws ...................................................................... Use oauth on beta en.wp and add beta en.ws Using oauth on beta sites means the 'Pywikibot-test' password does not need to be used on those sites, which is discouraged as the beta sites are not secure environments. Adds oauth to beta en.wp to run user tests on the largest beta site, providing better coverage on beta sites without a password. Add beta en.ws to the text matrix, not running user tests, hoping to catch any bugs on beta when oauth is not enabled. One test fails on beta en.ws due to the interwiki map (T69931). Bug: T100797 Change-Id: I607ec16288540d8b6375114ea1ac18e50e6c4828 --- M .travis.yml M tests/site_tests.py 2 files changed, 10 insertions(+), 2 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/.travis.yml b/.travis.yml index dc18b33..7a60b58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,9 @@ - if [[ $FAMILY == 'wpbeta' ]]; then python -m generate_family_file 'http://'$LANGUAGE'.wikipedia.beta.wmflabs.org/' 'wpbeta' 'y' ; fi + - if [[ $FAMILY == 'wsbeta' ]]; then + python -m generate_family_file 'http://'$LANGUAGE'.wikisource.beta.wmflabs.org/' 'wsbeta' 'y' ; + fi - python -W error::UserWarning -m generate_user_files -dir:~/.pywikibot/ -family:$FAMILY -lang:$LANGUAGE -v -user:"$PYWIKIBOT2_USERNAME" @@ -112,9 +115,11 @@ - python: '2.7_with_system_site_packages' # equivalent to virtualenv: system_site_packages: true env: LANGUAGE=he FAMILY=wikivoyage SITE_ONLY=1 - python: '2.7' - env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1 - - python: '3.4' + env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1 OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org" + - python: '3.3' env: LANGUAGE=zh FAMILY=wpbeta SITE_ONLY=1 OAUTH_DOMAIN="zh.wikipedia.beta.wmflabs.org" + - python: '3.4' + env: LANGUAGE=en FAMILY=wsbeta SITE_ONLY=1 - python: '2.7' env: LANGUAGE=wikia FAMILY=wikia PYWIKIBOT2_TEST_NO_RC=1 - python: '3.3' diff --git a/tests/site_tests.py b/tests/site_tests.py index 898f094..533c7b7 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -559,6 +559,9 @@ def testAllLinks(self): """Test the site.alllinks() method.""" + if self.site.family.name == 'wsbeta': + raise unittest.SkipTest('Test fails on betawiki; T69931') + mysite = self.get_site() fwd = list(mysite.alllinks(total=10)) self.assertLessEqual(len(fwd), 10) -- To view, visit https://gerrit.wikimedia.org/r/233341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I607ec16288540d8b6375114ea1ac18e50e6c4828 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

Fixed: wikimedia/pywikibot-core#2713 (master - 4e4578d)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2713 Status: Fixed Duration: 40 minutes and 26 seconds Commit: 4e4578d (master) Author: jenkins-bot Message: Merge "Skip patrol() test when no recent changes exist" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/87ed0e1fb377...4e4578df… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/77424259 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

[Gerrit] Set Session.cookies - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Set Session.cookies ...................................................................... Set Session.cookies This reverts an unrelated and unnecessary change in 8624ddec14. Bug: T110354 Change-Id: I25119aaf11366902985579eed28dc80294fcd2e5 --- M pywikibot/comms/http.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: XZise: Looks good to me, approved Malafaya: Checked jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 39d4d4a..835202f 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -64,8 +64,6 @@ 'two.') pywikibot.config2.socket_timeout = min(pywikibot.config2.socket_timeout) -session = requests.Session() - cookie_jar = cookielib.LWPCookieJar( config.datafilepath('pywikibot.lwp')) try: @@ -74,6 +72,9 @@ pywikibot.debug(u"Loading cookies failed.", _logger) else: pywikibot.debug(u"Loaded cookies from file.", _logger) + +session = requests.Session() +session.cookies = cookie_jar # Prepare flush on quit @@ -284,7 +285,6 @@ auth = None else: auth = requests_oauthlib.OAuth1(*auth) - cookies = cookie_jar timeout = config.socket_timeout try: ignore_validation = http_request.kwargs.pop( @@ -293,7 +293,7 @@ # HTTPS request can succeed even if the certificate is invalid and # verify=True, when a request with verify=False happened before response = session.request(method, uri, data=body, headers=headers, - cookies=cookies, auth=auth, timeout=timeout, + auth=auth, timeout=timeout, verify=not ignore_validation) except Exception as e: http_request.data = e -- To view, visit https://gerrit.wikimedia.org/r/234170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25119aaf11366902985579eed28dc80294fcd2e5 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Malafaya <malafaya(a)clix.pt> Gerrit-Reviewer: VcamX <vcamx3(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Assert user() is not None - change (pywikibot/core)

by XZise (Code Review)

XZise has submitted this change and it was merged. Change subject: Assert user() is not None ...................................................................... Assert user() is not None Also re-login during test tearDown. Bug: T109946 Change-Id: I842dce901f7c18bd745a86e2e9a21f1e7ef6a14b --- M tests/aspects.py 1 file changed, 9 insertions(+), 0 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/tests/aspects.py b/tests/aspects.py index de3ca79..f855e53 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -615,7 +615,15 @@ Login to the site if it is not logged in. """ super(RequireUserMixin, self).setUp() + self._reset_login() + def tearDown(self): + """Log back into the site.""" + super(RequireUserMixin, self).tearDown() + self._reset_login() + + def _reset_login(self): + """Login to all sites.""" sysop = hasattr(self, 'sysop') and self.sysop # There may be many sites, and setUp doesnt know @@ -629,6 +637,7 @@ if not site.logged_in(sysop): site.login(sysop) + assert(site.user()) def get_userpage(self, site=None): """Create a User object for the user's userpage.""" -- To view, visit https://gerrit.wikimedia.org/r/233187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I842dce901f7c18bd745a86e2e9a21f1e7ef6a14b Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Skip patrol() test when no recent changes exist - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Skip patrol() test when no recent changes exist ...................................................................... Skip patrol() test when no recent changes exist Bug: T110404 Change-Id: I2de795e8347777579c575670663b21db39d8bfda --- M tests/site_tests.py 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index ed12f11..274c9b7 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1610,7 +1610,11 @@ """Test the site.patrol() method.""" mysite = self.get_site() - rc = list(mysite.recentchanges(total=1))[0] + rc = list(mysite.recentchanges(total=1)) + if not rc: + raise unittest.SkipTest('no recent changes to patrol') + + rc = rc[0] # site.patrol() needs params self.assertRaises(pywikibot.Error, lambda x: list(x), mysite.patrol()) -- To view, visit https://gerrit.wikimedia.org/r/234172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2de795e8347777579c575670663b21db39d8bfda Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] [FIX] i18n_tests: fixed a typo in a comment - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] i18n_tests: fixed a typo in a comment ...................................................................... [FIX] i18n_tests: fixed a typo in a comment Change-Id: I60da5dddaaef848d519846883af1a231bdc681ad --- M tests/i18n_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 148e953..69ac9f1 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -133,7 +133,7 @@ if not isinstance(cls.message_package, basestring): raise TypeError('%s.message_package must be a package name' % cls.__name__) - # Th call to set_messages_package below exists only to confirm + # The call to set_messages_package below exists only to confirm # that the package exists and messages are available, so # that tests can be skipped if the i18n data doesnt exist. cls.orig_messages_package_name = i18n._messages_package_name -- To view, visit https://gerrit.wikimedia.org/r/233939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60da5dddaaef848d519846883af1a231bdc681ad Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Skip tests when token not available - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Skip tests when token not available ...................................................................... Skip tests when token not available Also only set pre-1.17 patrol token if user has an edit token to avoid KeyError. Split and better name other test classes. Bug: T85353 Change-Id: I2a14888bb3cd410f5ba43f75a7fb195b2b29d61c --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 87 insertions(+), 19 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/pywikibot/site.py b/pywikibot/site.py index c09f399..18c0758 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2986,7 +2986,8 @@ # TODO: try to catch exceptions? if 'patrol' in valid_tokens: if MediaWikiVersion('1.14') <= _version < MediaWikiVersion('1.17'): - user_tokens['patrol'] = user_tokens['edit'] + if 'edit' in user_tokens: + user_tokens['patrol'] = user_tokens['edit'] else: req = self._simple_request(action='query', list='recentchanges', diff --git a/tests/site_tests.py b/tests/site_tests.py index 898f094..c02d0af 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -27,6 +27,7 @@ from tests.aspects import ( unittest, TestCase, DeprecationTestCase, + TestCaseBase, DefaultSiteTestCase, DefaultDrySiteTestCase, WikimediaDefaultSiteTestCase, @@ -42,28 +43,32 @@ unicode = str -class TestSiteUserDeprecatedFunctions(DefaultSiteTestCase, DeprecationTestCase): +class TokenTestBase(TestCaseBase): - """Test cases for Site deprecated methods requiring a live wiki and user.""" + """Verify token exists before running tests.""" - cached = True - user = True - - def test_token(self): - """Test ability to get page tokens.""" + def setUp(self): + """Skip test if user does not have token and clear site wallet.""" mysite = self.get_site() - mainpage = self.get_mainpage() - ttype = "edit" + ttype = self.token_type try: token = mysite.tokens[ttype] except pywikibot.Error as error_msg: self.assertRegex( unicode(error_msg), "Action '[a-z]+' is not allowed for user .* on .* wiki.") - else: - self.assertEqual(token, mysite.token(mainpage, ttype)) - self.assertOneDeprecationParts('pywikibot.site.APISite.token', - "the 'tokens' property") + self.assertNotIn(self.token_type, self.site.tokens) + raise unittest.SkipTest(error_msg) + + self.token = token + self._orig_wallet = self.site.tokens + self.site.tokens = pywikibot.site.TokenWallet(self.site) + super(TokenTestBase, self).setUp() + + def tearDown(self): + """Restore site tokens.""" + self.site.tokens = self._orig_wallet + super(TokenTestBase, self).tearDown() class TestSiteObjectDeprecatedFunctions(DefaultSiteTestCase, DeprecationTestCase): @@ -1553,23 +1558,47 @@ self.assertTrue(len(revs) > 2) -class SiteUserTestCase2(DefaultSiteTestCase): +class TestUsernameInUsers(DefaultSiteTestCase): - """More tests that rely on a user account.""" + """Test that the user account can be found in users list.""" user = True + cached = True - def testUsers(self): - """Test the site.users() method.""" + def test_username_in_users(self): + """Test the site.users() method with bot username.""" mysite = self.get_site() us = list(mysite.users(mysite.user())) self.assertEqual(len(us), 1) self.assertIsInstance(us[0], dict) + + +class TestUserList(DefaultSiteTestCase): + + """Test usernames Jimbo Wales, Brion VIBBER and Tim Starling.""" + + cached = True + + def testUsers(self): + """Test the site.users() method with preset usernames.""" + mysite = self.site + cnt = 0 for user in mysite.users( ["Jimbo Wales", "Brion VIBBER", "Tim Starling"]): self.assertIsInstance(user, dict) self.assertTrue(user["name"] in ["Jimbo Wales", "Brion VIBBER", "Tim Starling"]) + cnt += 1 + if not cnt: + raise unittest.SkipTest('Test usernames not found') + + +class PatrolTestCase(TokenTestBase, DefaultSiteTestCase): + + """Test patrol method.""" + + user = True + token_type = 'patrol' def testPatrol(self): """Test the site.patrol() method.""" @@ -1735,10 +1764,48 @@ def testInvalidToken(self): self.assertRaises(pywikibot.Error, lambda t: self.mysite.tokens[t], "invalidtype") - def test_deprecated_token(self): + +class TestDeprecatedEditTokenFunctions(TokenTestBase, + DefaultSiteTestCase, + DeprecationTestCase): + + """Test cases for Site edit token deprecated methods.""" + + cached = True + user = True + token_type = 'edit' + + def test_token(self): + """Test ability to get page tokens using site.tokens.""" + token = self.token + mysite = self.get_site() + mainpage = self.get_mainpage() + ttype = "edit" + self.assertEqual(token, mysite.token(mainpage, ttype)) + self.assertOneDeprecationParts('pywikibot.site.APISite.token', + "the 'tokens' property") + + def test_getToken(self): + """Test ability to get page tokens using site.getToken.""" + self.mysite = self.site self.assertEqual(self.mysite.getToken(), self.mysite.tokens['edit']) + self.assertOneDeprecationParts('pywikibot.site.APISite.getToken', + "the 'tokens' property") + + +class TestDeprecatedPatrolToken(DefaultSiteTestCase, DeprecationTestCase): + + """Test cases for Site patrol token deprecated methods.""" + + cached = True + user = True + + def test_getPatrolToken(self): + """Test site.getPatrolToken.""" + self.mysite = self.site try: self.assertEqual(self.mysite.getPatrolToken(), self.mysite.tokens['patrol']) + self.assertOneDeprecation() except pywikibot.Error as error_msg: self.assertRegex( unicode(error_msg), -- To view, visit https://gerrit.wikimedia.org/r/233098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a14888bb3cd410f5ba43f75a7fb195b2b29d61c Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] PYWIKIBOT_TEST_MODULES to limit modules tested - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: PYWIKIBOT_TEST_MODULES to limit modules tested ...................................................................... PYWIKIBOT_TEST_MODULES to limit modules tested Change-Id: I342c012235c260717cf29e847dc9634988bf9e7f --- M tests/README.rst M tests/__init__.py 2 files changed, 20 insertions(+), 5 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/README.rst b/tests/README.rst index 349bf63..ed96b88 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -30,6 +30,11 @@ python setup.py test +:: + + python setup.py nosetests --tests tests + + Module unittest ~~~~~~~~~~~~~~~ @@ -54,22 +59,30 @@ :: - python -m unittest -v tests.site_tests + python -m unittest -v tests.api_tests tests.site_tests nose ~~~~ :: - nosetests -v tests.site_tests + nosetests -v tests.api_tests tests.site_tests pwb ~~~ :: + python pwb.py tests/api_tests.py -v python pwb.py tests/site_tests.py -v +env +~~~ + +:: + + PYWIKIBOT_TEST_MODULES=api,site python setup.py test + Travis CI ========= diff --git a/tests/__init__.py b/tests/__init__.py index 704920d..ff51b9b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -130,6 +130,10 @@ test_modules = library_test_modules + extra_test_modules + script_test_modules +if 'PYWIKIBOT_TEST_MODULES' in os.environ: + _enabled_test_modules = os.environ['PYWIKIBOT_TEST_MODULES'].split(',') + disabled_test_modules = set(test_modules) - set(_enabled_test_modules) + def collector(loader=unittest.loader.defaultTestLoader): """Load the default modules. @@ -152,9 +156,7 @@ % disabled_tests) modules = [module - for module in (library_test_modules + - extra_test_modules + - script_test_modules) + for module in test_modules if module not in disabled_test_modules] test_list = [] -- To view, visit https://gerrit.wikimedia.org/r/233194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I342c012235c260717cf29e847dc9634988bf9e7f Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2015