Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/120351
Change subject: (bugfix) re-enable test after obsolete site object changes ...................................................................... (bugfix) re-enable test after obsolete site object changes https://gerrit.wikimedia.org/r/#/c/120148/ breaks this test. This will be fixed by putting "obsolete" instance variable to SiteMock instance. Change-Id: If9802a1f1b116a446e60a268c0cbddf67b2c4f14 --- M tests/dry_site_tests.py 1 file changed, 68 insertions(+), 67 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/51/120351/1 diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index 61b6452..0d2bb53 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -4,70 +4,71 @@ class DrySite(pywikibot.site.APISite): - @property - def userinfo(self): - return self._userinfo - - -class TestDrySite(unittest.TestCase): - def test_logged_in(self): - x = DrySite('en') - - x._userinfo = {'name': None, 'groups': []} - x._username = ['normal_user', 'sysop_user'] - - self.assertFalse(x.logged_in(True)) - self.assertFalse(x.logged_in(False)) - - x._userinfo['name'] = 'normal_user' - self.assertFalse(x.logged_in(True)) - self.assertTrue(x.logged_in(False)) - - x._userinfo['name'] = 'sysop_user' - x._userinfo['groups'] = ['sysop'] - self.assertTrue(x.logged_in(True)) - self.assertFalse(x.logged_in(False)) - - -class SiteMock(object): - last_login = None - last_fn_called = False - - def login(self, as_sysop): - self.last_login = 'sysop' if as_sysop else 'user' - return True - - def inner_fn(self, *args, **kwargs): - self.last_fn_called = (args, kwargs) - return args, kwargs - - -class TestSiteMock(unittest.TestCase): - def test_must_be_user(self): - x = SiteMock() - wrapped_inner = pywikibot.site.must_be(group='user')(x.inner_fn) - self.assertEqual( - wrapped_inner(x, 1, 2, 3, a='a', b='b'), - ( - (x, 1, 2, 3), - {'a': 'a', 'b': 'b'} - ) - ) - self.assertEqual(x.last_fn_called, ((x, 1, 2, 3), {'a': 'a', 'b': 'b'})) - self.assertEqual(x.last_login, 'user') - - def test_must_be_sysop(self): - x = SiteMock() - wrapped_inner = pywikibot.site.must_be(group='sysop')(x.inner_fn) - self.assertEqual( - wrapped_inner(x, 1, 2, 3, a='a', b='b'), - ( - (x, 1, 2, 3), - {'a': 'a', 'b': 'b'} - ) - ) - self.assertEqual(x.last_fn_called, ((x, 1, 2, 3), {'a': 'a', 'b': 'b'})) - self.assertEqual(x.last_login, 'sysop') - -if __name__ == '__main__': - unittest.main() + @property + def userinfo(self): + return self._userinfo + + +class TestDrySite(unittest.TestCase): + def test_logged_in(self): + x = DrySite('en') + + x._userinfo = {'name': None, 'groups': []} + x._username = ['normal_user', 'sysop_user'] + + self.assertFalse(x.logged_in(True)) + self.assertFalse(x.logged_in(False)) + + x._userinfo['name'] = 'normal_user' + self.assertFalse(x.logged_in(True)) + self.assertTrue(x.logged_in(False)) + + x._userinfo['name'] = 'sysop_user' + x._userinfo['groups'] = ['sysop'] + self.assertTrue(x.logged_in(True)) + self.assertFalse(x.logged_in(False)) + + +class SiteMock(object): + last_login = None + last_fn_called = False + obsolete = False + + def login(self, as_sysop): + self.last_login = 'sysop' if as_sysop else 'user' + return True + + def inner_fn(self, *args, **kwargs): + self.last_fn_called = (args, kwargs) + return args, kwargs + + +class TestSiteMock(unittest.TestCase): + def test_must_be_user(self): + x = SiteMock() + wrapped_inner = pywikibot.site.must_be(group='user')(x.inner_fn) + self.assertEqual( + wrapped_inner(x, 1, 2, 3, a='a', b='b'), + ( + (x, 1, 2, 3), + {'a': 'a', 'b': 'b'} + ) + ) + self.assertEqual(x.last_fn_called, ((x, 1, 2, 3), {'a': 'a', 'b': 'b'})) + self.assertEqual(x.last_login, 'user') + + def test_must_be_sysop(self): + x = SiteMock() + wrapped_inner = pywikibot.site.must_be(group='sysop')(x.inner_fn) + self.assertEqual( + wrapped_inner(x, 1, 2, 3, a='a', b='b'), + ( + (x, 1, 2, 3), + {'a': 'a', 'b': 'b'} + ) + ) + self.assertEqual(x.last_fn_called, ((x, 1, 2, 3), {'a': 'a', 'b': 'b'})) + self.assertEqual(x.last_login, 'sysop') + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/120351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9802a1f1b116a446e60a268c0cbddf67b2c4f14 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
