Use xvfb only on Linux with xvfbwrapper

This commit is contained in:
Dmitri Bogomolov 2020-08-28 14:54:17 +03:00
parent 6f9b66ddff
commit d7cc8b112e
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
3 changed files with 9 additions and 2 deletions

View File

@ -18,5 +18,5 @@ install:
- export PYTHONWARNINGS=all
script:
- python checkdeps.py
- xvfb-run src/bitmessagemain.py -t
- python src/bitmessagemain.py -t
- python -bm tests

View File

@ -2,3 +2,4 @@ coverage
python_prctl
psutil
pycrypto
xvfbwrapper;platform_system=="Linux"

View File

@ -3,6 +3,7 @@ Tests for core and those that do not work outside
(because of import error for example)
"""
import atexit
import os
import pickle # nosec
import Queue
@ -398,8 +399,9 @@ def run():
suite = loader.loadTestsFromTestCase(TestCore)
try:
import bitmessageqt.tests
from xvfbwrapper import Xvfb
except ImportError:
pass
Xvfb = None
else:
qt_tests = loader.loadTestsFromModule(bitmessageqt.tests)
suite.addTests(qt_tests)
@ -410,4 +412,8 @@ def run():
sys.excepthook = keep_exc
if Xvfb:
vdisplay = Xvfb(width=1024, height=768)
vdisplay.start()
atexit.register(vdisplay.stop)
return unittest.TextTestRunner(verbosity=2).run(suite)