Test mode fixes

- don't test for pyqt in test mode
- better exit (thanks @g1itch)
This commit is contained in:
Peter Šurda 2018-04-03 22:26:58 +02:00
parent c3e7cf4f5c
commit 464b5b4f82
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87

View File

@ -325,12 +325,21 @@ class Main:
upnpThread = upnp.uPnPThread()
upnpThread.start()
if daemon == False and BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon') == False:
if daemon == False and BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon') == False and not state.testmode:
if state.curses == False:
if not depends.check_pyqt():
print('PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download PyQt from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\'. If you want to run in daemon mode, see https://bitmessage.org/wiki/Daemon')
print('You can also run PyBitmessage with the new curses interface by providing \'-c\' as a commandline argument.')
sys.exit()
sys.exit(
'PyBitmessage requires PyQt unless you want to'
' run it as a daemon and interact with it using'
' the API. You can download PyQt from'
' http://www.riverbankcomputing.com/software/pyqt/download'
' or by searching Google for \'PyQt Download\'.'
' If you want to run in daemon mode, see'
' https://bitmessage.org/wiki/Daemon\n'
'You can also run PyBitmessage with the'
' curses interface by providing \'-c\''
' as a commandline argument.'
)
import bitmessageqt
bitmessageqt.run()