Fixed early test failure on new pytest version. (#188)

* Fixed early test failure on new pytest version. See pytest-dev/pytest#607 for details. * Fixed pytest skips on python 2.6.
circuits · Jan 15, 2017 · cd17094 · cd17094
1 parent d6aeb45
commit cd17094
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,8 +34,8 @@ matrix:
 before_install:
   - ./.travis/install.sh
 install:
-  - pip install -r requirements-test.txt
-  - pip install -e .
+  - pip install -Ur requirements-test.txt
+  - pip install -Ue .
 script: python setup.py test
 after_success:
   - coveralls

diff --git a/tests/core/test_coroutine.py b/tests/core/test_coroutine.py
@@ -4,7 +4,7 @@
 
 
 import pytest
-pytest.skip("XXX: This test fails intermittently")
+pytest.mark.skip("XXX: This test fails intermittently")
 
 from circuits import Event, Component
 

diff --git a/tests/web/test_servers.py b/tests/web/test_servers.py
@@ -20,7 +20,7 @@
 
 
 if pytest.PYVER < (2, 7):
-    pytest.skip("This test requires Python=>2.7")
+    pytest.mark.skip("This test requires Python=>2.7")
 
 
 CERTFILE = path.join(path.dirname(__file__), "cert.pem")