Minor changes for testing on non-Linux platforms #1838
|
@ -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
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
coverage
|
||||
python_prctl;platform_system=="Linux"
|
||||
psutil
|
||||
pycrypto
|
||||
six
|
||||
PyQt5;python_version>="3.7"
|
||||
python_prctl;platform_system=="Linux"
|
||||
six
|
||||
xvfbwrapper;platform_system=="Linux"
|
||||
|
|
|
@ -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
|
||||
|
@ -416,8 +417,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)
|
||||
|
@ -428,4 +430,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)
|
||||
|
|
Reference in New Issue
Block a user