From b92878fef0209b4cea47970b78ef11b9fd8c8a6b Mon Sep 17 00:00:00 2001
From: Corey Goldberg <cgoldberg@gmail.com>
Date: Wed, 9 Dec 2015 08:08:18 -0500
Subject: [PATCH] dropped python 2.6 completely, dropped nose, don't redirect
 subprocess output

---
 .travis.yml    |  8 ++++----
 tox.ini        | 17 ++++-------------
 xvfbwrapper.py |  6 +-----
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c08794..48aa8b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y xvfb
-script: nosetests
+  - "sudo apt-get update -qq"
+  - "sudo apt-get install -y xvfb"
+script:
+  - "python -m unittest discover"
diff --git a/tox.ini b/tox.ini
index 489aa28..6aeec9c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,20 +4,11 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = flake8, py27, py32, py33, py34, pypy
-
-[flake8]
-exclude = .tox, build
+envlist=flake8,py27,py32,py33,py34,py35,pypy
 
 [testenv]
-deps =
-    nose
-commands =
-    {envpython} setup.py install
-    nosetests -v
+commands={envpython} -m unittest discover
 
 [testenv:flake8]
-deps =
-    flake8
-commands =
-    flake8
+deps=flake8
+commands=flake8
diff --git a/xvfbwrapper.py b/xvfbwrapper.py
index 5ce2a34..d61b9ae 100644
--- a/xvfbwrapper.py
+++ b/xvfbwrapper.py
@@ -47,11 +47,7 @@ class Xvfb:
     def start(self):
         self.vdisplay_num = self.search_for_free_display()
         self.xvfb_cmd = ['Xvfb', ':%d' % self.vdisplay_num] + self.xvfb_cmd
-
-        self.proc = subprocess.Popen(self.xvfb_cmd,
-                                     stdout=open(os.devnull),
-                                     stderr=open(os.devnull),
-                                     )
+        self.proc = subprocess.Popen(self.xvfb_cmd)
         time.sleep(0.2)  # give Xvfb time to start
         ret_code = self.proc.poll()
         if ret_code is None: