Browse Source

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

master
Corey Goldberg 6 years ago
parent
commit
b92878fef0
3 changed files with 9 additions and 22 deletions
  1. +4
    -4
      .travis.yml
  2. +4
    -13
      tox.ini
  3. +1
    -5
      xvfbwrapper.py

+ 4
- 4
.travis.yml View File

@ -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"

+ 4
- 13
tox.ini View File

@ -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

+ 1
- 5
xvfbwrapper.py View File

@ -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:


Loading…
Cancel
Save