Fixing ordering of Runner.run and version bump

Change-Id: I034f63f834a79d881c1e539ebda9c315d682962e
This commit is contained in:
Charles Neill 2016-10-26 21:39:14 -05:00
parent 18781c37cd
commit 65aa87a93b
2 changed files with 7 additions and 3 deletions

View File

@ -7,6 +7,7 @@ license = Apache License, Version 2.0
author = OpenStack Security Group
author-email = openstack-dev@lists.openstack.org
home-page = http://docs.openstack.org/developer/syntribos/
version = 0.2.0
classifier =
Environment :: Console
Intended Audience :: Information Technology

View File

@ -162,13 +162,17 @@ class Runner(object):
cli.print_symbol()
if CONF.sub_command.name == "init":
# If we are initializing, don't look for a default config file
if "init" in sys.argv:
cls.setup_config()
else:
cls.setup_config(use_file=True)
if CONF.sub_command.name == "init":
ENV.initialize_syntribos_env()
exit(0)
elif CONF.sub_command.name == "list_tests":
cls.setup_config()
cls.list_tests()
exit(0)
@ -178,7 +182,6 @@ class Runner(object):
"information about the installation process.")
exit(1)
cls.setup_config(use_file=True)
cls.setup_runtime_env()
decorator = unittest.runner._WritelnDecorator(cls.output)