jenkins-bot merged this change.

View Change

Approvals: Dvorapa: Looks good to me, but someone else must approve Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified
[cleanup] use setUpModule to skipping tests

Change-Id: I1ae3035d6aba82dd0af43dca94098009749cb8bd
---
M tests/tk_tests.py
1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/tests/tk_tests.py b/tests/tk_tests.py
index 844d238..c713f50 100644
--- a/tests/tk_tests.py
+++ b/tests/tk_tests.py
@@ -28,13 +28,6 @@

net = True

- @classmethod
- def setUpClass(cls):
- """Set up test class."""
- if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1':
- raise unittest.SkipTest('Tkdialog tests are disabled on Travis-CI')
- super(TestTkdialog, cls).setUpClass()
-
def testTkdialog(self):
"""Test Tk dialog."""
try:
@@ -50,13 +43,6 @@

net = True

- @classmethod
- def setUpClass(cls):
- """Set up test class."""
- if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1':
- raise unittest.SkipTest('Tkinter tests are disabled on Travis-CI')
- super(TestTkinter, cls).setUpClass()
-
def testTkinter(self):
"""Test Tkinter window."""
root = tkinter.Tk()
@@ -70,6 +56,12 @@
assert v is None


+def setUpModule(): # noqa: N802
+ """Skip Travis tests if PYWIKIBOT_TEST_GUI variable is not set."""
+ if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1':
+ raise unittest.SkipTest('Tkinter tests are disabled on Travis-CI')
+
+
if __name__ == '__main__': # pragma: no cover
try:
unittest.main()

To view, visit change 509360. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ae3035d6aba82dd0af43dca94098009749cb8bd
Gerrit-Change-Number: 509360
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb@gmail.com>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999@gmail.com>
Gerrit-Reviewer: jenkins-bot (75)