fixes
This commit is contained in:
parent
4bd5b49151
commit
f5b14ccdb2
|
@ -17,6 +17,13 @@ import pep8
|
||||||
|
|
||||||
class TestXvfb(unittest.TestCase):
|
class TestXvfb(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
sys.stdout = sys.__stdout__
|
||||||
|
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()
|
||||||
self.addCleanup(xvfb.stop)
|
self.addCleanup(xvfb.stop)
|
||||||
|
|
|
@ -45,11 +45,12 @@ class Xvfb:
|
||||||
stdout=open(os.devnull),
|
stdout=open(os.devnull),
|
||||||
stderr=open(os.devnull),
|
stderr=open(os.devnull),
|
||||||
)
|
)
|
||||||
time.sleep(0.1) # 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:
|
||||||
self._redirect_display(self.vdisplay_num)
|
self._redirect_display(self.vdisplay_num)
|
||||||
else:
|
else:
|
||||||
|
self._redirect_display(self.old_display_num)
|
||||||
self.proc = None
|
self.proc = None
|
||||||
print('Error: Xvfb did not start')
|
print('Error: Xvfb did not start')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue