jenkins-bot has submitted this change and it was merged.
Change subject: Flag http and weblib tests as 'net' tests ......................................................................
Flag http and weblib tests as 'net' tests
This allows nosetests to be able to skip these tests.
Change-Id: I712a196bfefd8ec0aa2398d87a983b82f1ed4a8f --- M tests/http_tests.py M tests/weblib_tests.py M tox.ini 3 files changed, 5 insertions(+), 1 deletion(-)
Approvals: Merlijn van Deen: Looks good to me, approved Hashar: Looks good to me, but someone else must approve jenkins-bot: Verified
diff --git a/tests/http_tests.py b/tests/http_tests.py index 646c999..c00fc86 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -16,6 +16,8 @@
class HttpTestCase(NoSiteTestCase):
+ net = True + def test_get(self): r = http.request(site=None, uri='http://www.wikipedia.org/') self.assertIsInstance(r, str) diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index 58a0392..110606f 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -19,6 +19,8 @@
class TestArchiveSites(NoSiteTestCase):
+ net = True + @classmethod def setUpClass(cls): if os.environ.get('TRAVIS', 'false') == 'true': diff --git a/tox.ini b/tox.ini index c2e9021..9339bcc 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@
[testenv:nose] setenv = PYWIKIBOT2_NO_USER_CONFIG=1 -commands = nosetests -a "!site" +commands = nosetests -a "!site,!net" deps = nose
[testenv:venv]