summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2019-01-02 00:06:31 +0100
committerSebastian Pipping <sebastian@pipping.org>2019-12-09 23:46:12 +0100
commita47e4b9176d0a7973d4297a230e8f64412a558f4 (patch)
tree075e8f7477a3255e2ad1fc2f2fa31266839fda12
parent3d9a8c1d862a5fbbeb2676c283f5c42917702aa5 (diff)
downloadbottle-a47e4b9176d0a7973d4297a230e8f64412a558f4.tar.gz
ci: Do not tolerate import errors for 2.7 and 3.6 on Travis
-rw-r--r--test/test_server.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/test_server.py b/test/test_server.py
index 2f6df1e..0a48e41 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -54,9 +54,11 @@ class TestServer(unittest.TestCase):
if rv is None:
raise AssertionError("Server took too long to start up.")
if rv is 128: # Import error
- tools.warn("Skipping %r test (ImportError)." % self.server)
- self.skip = True
- return
+ if os.environ.get('CI') != 'true' or \
+ os.environ.get('TRAVIS_PYTHON_VERSION') not in ('2.7', '3.6'):
+ tools.warn("Skipping %r test (ImportError)." % self.server)
+ self.skip = True
+ return
if rv is 3: # Port in use
continue
raise AssertionError("Server exited with error code %d" % rv)