jenkins-bot has submitted this change and it was merged.
Change subject: Fixup 178460
......................................................................
Fixup 178460
It allows stdout to be a part of set(' >\n') not all of it
Change-Id: I1b24f33d2298d5a34a670b6b44506ab10f0c7b64
---
M tests/script_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/script_tests.py b/tests/script_tests.py
index 88dd3be..f7e2422 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -338,7 +338,7 @@
# But also complain if there is any stdout
# but ignore shell.py emiting its '>>> ' prompt.
if ((script_name == 'shell' and
- set(result['stdout']) == set('> \n'))
+ set(result['stdout']).issubset(set('> \n')))
or result['stdout'] == ''):
result['stdout'] = None
self.assertIsNone(result['stdout'])
--
To view, visit https://gerrit.wikimedia.org/r/178818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b24f33d2298d5a34a670b6b44506ab10f0c7b64
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: Allow shell.py to emit its prompt multiple times
......................................................................
Allow shell.py to emit its prompt multiple times
1d0f94c allowed shell.py to emit a single '>>> ' on stdout.
Sometimes it emits '>>> >>> ', so allow that too.
https://travis-ci.org/wikimedia/pywikibot-core/jobs/43425062
Change-Id: I746187d58e254d2d83b41b24874479bb954475b4
---
M tests/script_tests.py
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/script_tests.py b/tests/script_tests.py
index 06f3df7..8acb41e 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -335,8 +335,10 @@
# Specifically look for deprecated
self.assertNotIn('deprecated', result['stdout'].lower())
# But also complain if there is any stdout
- # but ignore shell.py emiting a prompt
- if result['stdout'] in ['', '>>> ']:
+ # but ignore shell.py emiting its '>>> ' prompt.
+ if ((script_name == 'shell' and
+ set(result['stdout']) == set('> \n'))
+ or result['stdout'] == ''):
result['stdout'] = None
self.assertIsNone(result['stdout'])
--
To view, visit https://gerrit.wikimedia.org/r/178460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I746187d58e254d2d83b41b24874479bb954475b4
Gerrit-PatchSet: 4
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: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>
Build Update for jayvdb/pywikibot-core
-------------------------------------
Build: #158
Status: Passed
Duration: 29 minutes and 22 seconds
Commit: 322ae3b (review/john_vandenberg/auto-langs)
Author: John Vandenberg
Message: New AutoSubdomainFamily, used for Wikia family
Allow access to any Wikia subdomain.
e.g. using mylang='fr.lyrics' with family='wikia'.
Introduces abstract class AutoLangFamily which can be used for
other approaches to automatically adding langs.
Change-Id: I18fcb8a619ed768526d739a012a06f601e93b6a4
View the changeset: https://github.com/jayvdb/pywikibot-core/compare/601f3e25fe86^...322ae3bcc5…
View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/43567233
--
You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications
Build Update for jayvdb/pywikibot-core
-------------------------------------
Build: #157
Status: Failed
Duration: 31 minutes and 57 seconds
Commit: 0da2ea5 (review/ricordisamoa/classmethods-rebased)
Author: Ricordisamoa
Message: [WIP] improve methods not bound to an instance
- turned several staticmethods into classmethods
- fixed DataSite's inheritance from APISite
Change-Id: I5c8024bb086c4302a5f02dbed26fd3e24696e699
View the changeset: https://github.com/jayvdb/pywikibot-core/compare/f3f7c1248fbc^...0da2ea5de8…
View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/43559704
--
You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications
Build Update for jayvdb/pywikibot-core
-------------------------------------
Build: #156
Status: Failed
Duration: 29 minutes and 0 seconds
Commit: d49295d (review/ricordisamoa/classmethods)
Author: Ricordisamoa
Message: [WIP] improve methods not bound to an instance
- turned several staticmethods into classmethods
- fixed DataSite's inheritance from APISite
Change-Id: I5c8024bb086c4302a5f02dbed26fd3e24696e699
View the changeset: https://github.com/jayvdb/pywikibot-core/compare/2f072d7c3d03^...d49295d20d…
View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/43559649
--
You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications