fixed tests so they run properly under tox, and added verbosity to test output
This commit is contained in:
parent
becf66efc9
commit
3841f2b74d
|
@ -4,18 +4,13 @@
|
||||||
from xvfbwrapper import Xvfb
|
from xvfbwrapper import Xvfb
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
|
|
||||||
class TestXvfb(unittest.TestCase):
|
class TestXvfb(unittest.TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
sys.stdout = sys.__stdout__
|
os.environ['DISPLAY'] = ':0'
|
||||||
self.addCleanup(self.restore_stdout)
|
|
||||||
|
|
||||||
def restore_stdout(self):
|
|
||||||
sys.stdout = sys.__stdout__
|
|
||||||
|
|
||||||
def test_start(self):
|
def test_start(self):
|
||||||
xvfb = Xvfb()
|
xvfb = Xvfb()
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -4,7 +4,7 @@
|
||||||
# and then run "tox" from this directory.
|
# and then run "tox" from this directory.
|
||||||
|
|
||||||
[tox]
|
[tox]
|
||||||
envlist = flake8, py27, py32, py33
|
envlist = flake8, py27, py32, py33, py34, pypy
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
exclude = .tox, build
|
exclude = .tox, build
|
||||||
|
@ -14,7 +14,7 @@ deps =
|
||||||
nose
|
nose
|
||||||
commands =
|
commands =
|
||||||
{envpython} setup.py install
|
{envpython} setup.py install
|
||||||
nosetests
|
nosetests -v
|
||||||
|
|
||||||
[testenv:flake8]
|
[testenv:flake8]
|
||||||
deps =
|
deps =
|
||||||
|
|
Loading…
Reference in New Issue