From c054bddd1a3143bec57363224408beba492ce3c8 Mon Sep 17 00:00:00 2001 From: Randall Leeds Date: Mon, 13 Jul 2015 12:52:52 -0700 Subject: [PATCH 1/2] Use the travis container-based infrastructure --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 411a935c..652f98a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: python env: - TOXENV=py26 From ec84c80c7574f4fa8076f3f5b404b125da3586ae Mon Sep 17 00:00:00 2001 From: Randall Leeds Date: Mon, 13 Jul 2015 14:32:01 -0700 Subject: [PATCH 2/2] On pypy3 IOError is not OSError --- tests/test_selectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_selectors.py b/tests/test_selectors.py index 6a6d8833..8018fc98 100644 --- a/tests/test_selectors.py +++ b/tests/test_selectors.py @@ -381,7 +381,7 @@ class ScalableSelectorMixIn: for i in range(NUM_FDS // 2): try: rd, wr = self.make_socketpair() - except OSError: + except (IOError, OSError): # too many FDs, skip - note that we should only catch EMFILE # here, but apparently *BSD and Solaris can fail upon connect() # or bind() with EADDRNOTAVAIL, so let's be safe