raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Add pytest to optional dependencies in check_dependecies.py

Browse Source
This commit is contained in:
Martin Zibricky 2011-09-02 13:10:07 +02:00
parent b24a73d806
commit e4f3041802
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/__init__.py
View File

@ -261,8 +261,10 @@ def main(args=None):
app.setApplicationName(u'OpenLP') app.setApplicationName(u'OpenLP')
app.setApplicationVersion(get_application_version()[u'version']) app.setApplicationVersion(get_application_version()[u'version'])
# Instance check # Instance check
if app.isAlreadyRunning(): if not options.testing:
sys.exit() # Instance check
if app.isAlreadyRunning():
sys.exit()
# First time checks in settings # First time checks in settings
if not QtCore.QSettings().value(u'general/has run wizard', if not QtCore.QSettings().value(u'general/has run wizard',
QtCore.QVariant(False)).toBool(): QtCore.QVariant(False)).toBool():
@ -284,5 +286,7 @@ def main(args=None):
# Do not run method app.exec_() when running gui tests # Do not run method app.exec_() when running gui tests
if options.testing: if options.testing:
app.run(qt_args, testing=True) app.run(qt_args, testing=True)
# For gui tests we need access to window intances and their components
return app
else: else:
sys.exit(app.run(qt_args)) sys.exit(app.run(qt_args))

1
scripts/check_dependencies.py
View File

@ -80,6 +80,7 @@ OPTIONAL_MODULES = [
('sqlite', ' (SQLite 2 support)'), ('sqlite', ' (SQLite 2 support)'),
('MySQLdb', ' (MySQL support)'), ('MySQLdb', ' (MySQL support)'),
('psycopg2', ' (PostgreSQL support)'), ('psycopg2', ' (PostgreSQL support)'),
('pytest', ' (testing framework)'),
] ]
w = sys.stdout.write w = sys.stdout.write