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

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."""