dropped python 2.6 completely, dropped nose, don't redirect subprocess output

This commit is contained in:
Corey Goldberg 2015-12-09 08:08:18 -05:00
parent d8f7748501
commit b92878fef0
3 changed files with 9 additions and 22 deletions

View File

@ -1,12 +1,12 @@
language: python language: python
python: python:
- "2.6"
- "2.7" - "2.7"
- "3.2" - "3.2"
- "3.3" - "3.3"
- "3.4" - "3.4"
- "3.5" - "3.5"
before_install: before_install:
- sudo apt-get update -qq - "sudo apt-get update -qq"
- sudo apt-get install -y xvfb - "sudo apt-get install -y xvfb"
script: nosetests script:
- "python -m unittest discover"

17
tox.ini
View File

@ -4,20 +4,11 @@
# and then run "tox" from this directory. # and then run "tox" from this directory.
[tox] [tox]
envlist = flake8, py27, py32, py33, py34, pypy envlist=flake8,py27,py32,py33,py34,py35,pypy
[flake8]
exclude = .tox, build
[testenv] [testenv]
deps = commands={envpython} -m unittest discover
nose
commands =
{envpython} setup.py install
nosetests -v
[testenv:flake8] [testenv:flake8]
deps = deps=flake8
flake8 commands=flake8
commands =
flake8

View File

@ -47,11 +47,7 @@ class Xvfb:
def start(self): def start(self):
self.vdisplay_num = self.search_for_free_display() self.vdisplay_num = self.search_for_free_display()
self.xvfb_cmd = ['Xvfb', ':%d' % self.vdisplay_num] + self.xvfb_cmd self.xvfb_cmd = ['Xvfb', ':%d' % self.vdisplay_num] + self.xvfb_cmd
self.proc = subprocess.Popen(self.xvfb_cmd)
self.proc = subprocess.Popen(self.xvfb_cmd,
stdout=open(os.devnull),
stderr=open(os.devnull),
)
time.sleep(0.2) # give Xvfb time to start time.sleep(0.2) # give Xvfb time to start
ret_code = self.proc.poll() ret_code = self.proc.poll()
if ret_code is None: if ret_code is None: