Pywikibot-commits January 2017

pywikibot-commits@lists.wikimedia.org

2 participants
67 discussions

Errored: wikimedia/pywikibot-core#3792 (master - 10b17d4)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3792 Status: Errored Duration: 42 minutes and 39 seconds Commit: 10b17d4 (master) Author: jenkins-bot Message: Merge "Replace assertRaises with asserRaisesRegex in tools_tests.py" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/61e2fbe00d7e...10b17d4c… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/191019574 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 4 months

[Gerrit] pywikibot/core[master]: Replace assertRaises with asserRaisesRegex in tools_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331141 ) Change subject: Replace assertRaises with asserRaisesRegex in tools_tests.py ...................................................................... Replace assertRaises with asserRaisesRegex in tools_tests.py assertRaises is not as good of a test as asserRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: I99f62d6eade8d0878858bab749022eb4e12cb8b3 --- M tests/tools_tests.py 1 file changed, 45 insertions(+), 16 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/tools_tests.py b/tests/tools_tests.py index a3623ab..6e97772 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -74,7 +74,8 @@ """Check that the wrapper permits exceptions.""" wrapper = tools.ContextManagerWrapper(self.DummyClass()) self.assertFalse(wrapper.closed) - with self.assertRaises(ZeroDivisionError): + with self.assertRaisesRegex(ZeroDivisionError, + '(integer division or modulo by zero|division by zero)'): with wrapper: 1 / 0 self.assertTrue(wrapper.closed) @@ -133,9 +134,14 @@ def test_open_archive_without_bz2(self): """Test open_archive when bz2 and bz2file are not available.""" old_bz2 = tools.bz2 + BZ2_IMPORT_ERROR = ('This is a fake exception message that is ' + 'used when bz2 and bz2file is not importable') try: - tools.bz2 = ImportError() - self.assertRaises(ImportError, self._get_content, self.base_file + '.bz2') + tools.bz2 = ImportError(BZ2_IMPORT_ERROR) + self.assertRaisesRegex(ImportError, + BZ2_IMPORT_ERROR, + self._get_content, + self.base_file + '.bz2') finally: tools.bz2 = old_bz2 @@ -145,13 +151,17 @@ def test_open_archive_7z(self): """Test open_archive with 7za if installed.""" + FAILED_TO_OPEN_7ZA = 'Unexpected STDERR output from 7za ' try: subprocess.Popen(['7za'], stdout=subprocess.PIPE).stdout.close() except OSError: raise unittest.SkipTest('7za not installed') self.assertEqual(self._get_content(self.base_file + '.7z'), self.original_content) - self.assertRaises(OSError, self._get_content, self.base_file + '_invalid.7z', - use_extension=True) + self.assertRaisesRegex(OSError, + FAILED_TO_OPEN_7ZA, + self._get_content, + self.base_file + '_invalid.7z', + use_extension=True) class OpenCompressedTestCase(OpenArchiveTestCase, DeprecationTestCase): @@ -202,14 +212,26 @@ def test_invalid_modes(self): """Test various invalid mode configurations.""" - self.assertRaises(ValueError, tools.open_archive, - '/dev/null', 'ra') # two modes besides - self.assertRaises(ValueError, tools.open_archive, - '/dev/null', 'rt') # text mode - self.assertRaises(ValueError, tools.open_archive, - '/dev/null', 'br') # binary at front - self.assertRaises(ValueError, tools.open_archive, - '/dev/null', 'wb', False) # writing without extension + INVALID_MODE_RA = 'Invalid mode: "ra"' + INVALID_MODE_RT = 'Invalid mode: "rt"' + INVALID_MODE_BR = 'Invalid mode: "br"' + MN_DETECTION_ONLY = 'Magic number detection only when reading' + self.assertRaisesRegex(ValueError, + INVALID_MODE_RA, + tools.open_archive, + '/dev/null', 'ra') # two modes besides + self.assertRaisesRegex(ValueError, + INVALID_MODE_RT, + tools.open_archive, + '/dev/null', 'rt') # text mode + self.assertRaisesRegex(ValueError, + INVALID_MODE_BR, + tools.open_archive, + '/dev/null', 'br') # binary at front + self.assertRaisesRegex(ValueError, + MN_DETECTION_ONLY, + tools.open_archive, + '/dev/null', 'wb', False) # writing without extension def test_binary_mode(self): """Test that it uses binary mode.""" @@ -230,8 +252,12 @@ def test_write_archive_7z(self): """Test writing an archive as a 7z archive.""" - self.assertRaises(NotImplementedError, tools.open_archive, - '/dev/null.7z', mode='wb') + FAILED_TO_WRITE_7Z = 'It is not possible to write a 7z file.' + self.assertRaisesRegex(NotImplementedError, + FAILED_TO_WRITE_7Z, + tools.open_archive, + '/dev/null.7z', + mode='wb') class MergeUniqueDicts(TestCase): @@ -347,7 +373,10 @@ def test_accept_only_keyword_marker(self): """Test that the only kwargs accepted is 'marker'.""" - self.assertRaises(TypeError, tools.islice_with_ellipsis(self.it, 1, t='')) + GENERATOR_NOT_CALLABLE = "'generator' object is not callable" + self.assertRaisesRegex(TypeError, + GENERATOR_NOT_CALLABLE, + tools.islice_with_ellipsis(self.it, 1, t='')) def passthrough(x): -- To view, visit https://gerrit.wikimedia.org/r/331141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I99f62d6eade8d0878858bab749022eb4e12cb8b3 Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: SacredWKnight <yudhis.sumardiono(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: SacredWKnight <yudhis.sumardiono(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 4 months

Errored: wikimedia/pywikibot-core#3791 (master - 61e2fbe)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3791 Status: Errored Duration: 43 minutes and 20 seconds Commit: 61e2fbe (master) Author: jenkins-bot Message: Merge "Added tests for cherry_pick function of diff module" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/2c33f951d7b0...61e2fbe0… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/190984564 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 4 months

[Gerrit] pywikibot/core[master]: Added tests for cherry_pick function of diff module

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331576 ) Change subject: Added tests for cherry_pick function of diff module ...................................................................... Added tests for cherry_pick function of diff module Bug: T130805 Change-Id: I8fc121dc44382a6edfb9990f0442704d0f269f10 --- M tests/diff_tests.py 1 file changed, 71 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/diff_tests.py b/tests/diff_tests.py index cbdc76d..82d1547 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -11,7 +11,7 @@ import sys -from pywikibot.diff import html_comparator, PatchManager +from pywikibot.diff import cherry_pick, html_comparator, PatchManager from pywikibot.tools import PY2 from tests import join_html_data_path @@ -192,6 +192,76 @@ self.assertEqual(p.hunks[key].diff_plain_text, case[2][key]) +class TestCherryPick(TestCase): + + """Test cherry_pick method.""" + + net = False + + # texts used during testing + oldtext = 'old' + newtext = 'new' + + # output messages expected during testing + diff_message = '\x03{lightred}- old\n\x03{default}\x03{lightgreen}+ new\n\x03{default}' + none_message = '\x03{{lightpurple}}{0: ^50}\x03{{default}}'.format('None.') + header_base = '\n\x03{{lightpurple}}{0:*^50}\x03{{default}}\n' + headers = [' ALL CHANGES ', ' REVIEW CHANGES ', ' APPROVED CHANGES '] + diff_by_letter_message = ("\x03{lightred}- o\n\x03{default}" + "\x03{lightred}- l\n\x03{default}" + "\x03{lightred}- d\n\x03{default}" + "\x03{lightgreen}+ n\n\x03{default}" + "\x03{lightgreen}+ e\n\x03{default}" + "\x03{lightgreen}+ w\n\x03{default}") + + def check_headers(self, mock): + """Check if all headers were added to ouput.""" + for header in self.headers: + mock.assert_any_call(self.header_base.format(header)) + + @patch('pywikibot.output') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='y') + def test_accept(self, input, mock): + """Check output of cherry_pick if changes accepted.""" + self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.newtext) + self.check_headers(mock) + mock.assert_any_call(self.diff_message) + + @patch('pywikibot.output') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='n') + def test_reject(self, input, mock): + """Check output of cherry_pick if changes rejected.""" + self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.oldtext) + self.check_headers(mock) + mock.assert_any_call(self.diff_message) + mock.assert_any_call(self.none_message) + + @patch('pywikibot.output') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='q') + def test_quit(self, input, mock): + """Check output of cherry_pick if quitted.""" + self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.oldtext) + self.check_headers(mock) + mock.assert_any_call(self.diff_message) + mock.assert_any_call(self.none_message) + + @patch('pywikibot.output') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='y') + def test_by_letter_accept(self, input, mock): + """Check output of cherry_pick if by_letter diff is enabled and changes accepted.""" + self.assertEqual(cherry_pick(self.oldtext, self.newtext, by_letter=True), self.newtext) + self.check_headers(mock) + mock.assert_any_call(self.diff_by_letter_message) + + @patch('pywikibot.output') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='q') + def test_by_letter_quit(self, input, mock): + """Check output of cherry_pick if by_letter diff is enabled and quitted during review.""" + self.assertEqual(cherry_pick(self.oldtext, self.newtext, by_letter=True), self.oldtext) + self.check_headers(mock) + mock.assert_any_call(self.diff_by_letter_message) + mock.assert_any_call(self.none_message) + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/331576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fc121dc44382a6edfb9990f0442704d0f269f10 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Phantom42 <nikitav30(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 4 months

Errored: wikimedia/pywikibot-core#3790 (master - 2c33f95)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3790 Status: Errored Duration: 41 minutes and 5 seconds Commit: 2c33f95 (master) Author: Kenstin Message: Replace assertRaises with assertRaisesRegex in bot_tests.py assertRaises is not as good of a test as assertRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: I5c96d8df488c37494094de2d20c76082d5933b6b View the changeset: https://github.com/wikimedia/pywikibot-core/compare/b3b2b70bdaf9...2c33f951… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/190830140 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 4 months

[Gerrit] pywikibot/core[master]: Replace assertRaises with assertRaisesRegex in bot_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331160 ) Change subject: Replace assertRaises with assertRaisesRegex in bot_tests.py ...................................................................... Replace assertRaises with assertRaisesRegex in bot_tests.py assertRaises is not as good of a test as assertRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: I5c96d8df488c37494094de2d20c76082d5933b6b --- M tests/bot_tests.py 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/bot_tests.py b/tests/bot_tests.py index a0eb9a7..ad7d3bb 100644 --- a/tests/bot_tests.py +++ b/tests/bot_tests.py @@ -171,7 +171,7 @@ self.assertIs(exc, exception) else: self.assertIsNone(exc) - self.assertRaises(StopIteration, next, self._page_iter) + self.assertRaisesRegex(StopIteration, '^$', next, self._page_iter) return exit @@ -179,6 +179,8 @@ """Tests for the BaseBot subclasses.""" + CANT_SET_ATTRIBUTE_RE = 'can\'t set attribute' + NOT_IN_TREAT_RE = 'Requesting the site not while in treat is not allowed.' dry = True sites = { @@ -226,9 +228,9 @@ # Assert no specific site self._treat_site = False self.bot = pywikibot.bot.MultipleSitesBot(generator=self._generator()) - with self.assertRaises(AttributeError): + with self.assertRaisesRegex(AttributeError, self.CANT_SET_ATTRIBUTE_RE): self.bot.site = self.de - with self.assertRaises(ValueError): + with self.assertRaisesRegex(ValueError, self.NOT_IN_TREAT_RE): self.bot.site if PY2: # The exc_info still contains the AttributeError :/ @@ -236,7 +238,7 @@ self.bot.treat = self._treat(self._generator()) self.bot.exit = self._exit(4) self.bot.run() - with self.assertRaises(ValueError): + with self.assertRaisesRegex(ValueError, self.NOT_IN_TREAT_RE): self.bot.site if PY2: # The exc_info still contains the AttributeError :/ @@ -275,7 +277,7 @@ pywikibot.Page(self.de, 'Page 3')], post_treat) self.bot.exit = self._exit(2, exception=ValueError) - self.assertRaises(ValueError, self.bot.run) + self.assertRaisesRegex(ValueError, 'Whatever', self.bot.run) def test_Bot_KeyboardInterrupt(self): """Test normal Bot class with a KeyboardInterrupt in treat.""" -- To view, visit https://gerrit.wikimedia.org/r/331160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c96d8df488c37494094de2d20c76082d5933b6b Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Kenstin <k3nstin(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 4 months

Errored: wikimedia/pywikibot-core#3789 (master - b3b2b70)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3789 Status: Errored Duration: 45 minutes and 54 seconds Commit: b3b2b70 (master) Author: repreus Message: Replace assertRaises with assertRaisesRegex in ui_options_tests.py assertRaises is not as good of a test as assertRaisesRegex. The latter has an extra parameter to match the exception message, allowing more precision when checking an error. Bug: T154281 Change-Id: Id7075b2d09078c6d56bec7138771398f1620a8e5 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/a2c4e40755a6...b3b2b70b… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/190558049 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 4 months

[Gerrit] pywikibot/core[master]: Replace assertRaises with assertRaisesRegex in ui_options_te...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331396 ) Change subject: Replace assertRaises with assertRaisesRegex in ui_options_tests.py ...................................................................... Replace assertRaises with assertRaisesRegex in ui_options_tests.py assertRaises is not as good of a test as assertRaisesRegex. The latter has an extra parameter to match the exception message, allowing more precision when checking an error. Bug: T154281 Change-Id: Id7075b2d09078c6d56bec7138771398f1620a8e5 --- M tests/ui_options_tests.py 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py index dd08650..0a7d8c7 100644 --- a/tests/ui_options_tests.py +++ b/tests/ui_options_tests.py @@ -20,6 +20,8 @@ """Test cases for input_choice Option.""" + TEST_RE = '\'int\' object has no attribute \'lower\'' + SEQ_EMPTY_RE = 'The sequence is empty.' net = False def test_formatted(self): @@ -29,7 +31,7 @@ def test_output(self): """Test OutputOption.""" option = bot_choice.OutputOption() - with self.assertRaises(NotImplementedError): + with self.assertRaisesRegex(NotImplementedError, ''): message('?', [option], None) def test_standard(self): @@ -75,7 +77,7 @@ self.assertEqual(option.format(), 'r<number> [1-5]') self.assertEqual(message('?', [option], None), '? (r<number> [1-5])') self.assertEqual(message('?', [option], 'r3'), '? (r<number> [1-[3]-5])') - self.assertRaises(AttributeError, option.test, 1) + self.assertRaisesRegex(AttributeError, self.TEST_RE, option.test, 1) self.assertFalse(option.test('0')) self.assertFalse(option.test('r0')) self.assertFalse(option.test('r6')) @@ -87,7 +89,7 @@ def test_List(self): """Test ListOption.""" - self.assertRaises(ValueError, bot.ListOption, []) + self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, bot.ListOption, []) options = ['foo', 'bar'] option = bot.ListOption(options) self.assertEqual(message('?', [option], None), '? (<number> [1-2])') @@ -99,8 +101,8 @@ self.assertEqual(message('?', [option], None), '? (<number> [1])') self.assertEqual(message('?', [option], '1'), '? (<number> [[1]])') options.pop() - self.assertRaises(ValueError, option.format, None) - self.assertRaises(ValueError, option.format) + self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, option.format, None) + self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, option.format) self.assertFalse(option.test('0')) options += ['baz', 'quux', 'norf'] self.assertEqual(message('?', [option], None), '? (<number> [1-3])') -- To view, visit https://gerrit.wikimedia.org/r/331396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7075b2d09078c6d56bec7138771398f1620a8e5 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Preus <panma(a)vp.pl> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 4 months

Errored: wikimedia/pywikibot-core#3788 (master - a2c4e40)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3788 Status: Errored Duration: 43 minutes and 43 seconds Commit: a2c4e40 (master) Author: dalba Message: site_tests.py: Remove test_search_where_text and test_search_where_nearmatch According to T154663, CirrusSearch search results are not deterministic and these tests can fail anytime without any specific meaning. Other aspects of the `search` method are covered by other tests. Bug: T151369 Change-Id: I2d69900227d3c78a2c2e8cc11c22e84ddf01a0c5 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/846d82c57494...a2c4e407… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/190337442 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 4 months

[Gerrit] pywikibot/core[master]: site_tests.py: Remove test_search_where_text and test_search...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330677 ) Change subject: site_tests.py: Remove test_search_where_text and test_search_where_nearmatch ...................................................................... site_tests.py: Remove test_search_where_text and test_search_where_nearmatch According to T154663, CirrusSearch search results are not deterministic and these tests can fail anytime without any specific meaning. Other aspects of the `search` method are covered by other tests. Bug: T151369 Change-Id: I2d69900227d3c78a2c2e8cc11c22e84ddf01a0c5 --- M tests/site_tests.py 1 file changed, 0 insertions(+), 15 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 84ce632..9d47b58 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1413,21 +1413,6 @@ raise unittest.SkipTest("gsrsearch returned timeout on site: %r" % e) raise - def test_search_where_text(self): - """Test the site.search() method with 'where' parameter set to text.""" - self.assertEqual(list(self.site.search('wiki', total=10)), - list(self.site.search('wiki', total=10, - where='text'))) - - def test_search_where_nearmatch(self): - """Test the site.search(). - - 'where' parameter set to 'nearmatch'. - """ - self.assertLessEqual(len(list(self.site.search('wiki', total=10, - where='nearmatch'))), - len(list(self.site.search('wiki', total=10)))) - def test_search_where_title(self): """Test site.search() method with 'where' parameter set to title.""" try: -- To view, visit https://gerrit.wikimedia.org/r/330677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d69900227d3c78a2c2e8cc11c22e84ddf01a0c5 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2017