Skip to content

Commit

Permalink
Display help without any precondition.
Browse files Browse the repository at this point in the history
JIRA: PDC-1630 PDC-1631
  • Loading branch information
simozhan committed Jul 22, 2016
1 parent add020d commit 1f11f88
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 31 deletions.
2 changes: 1 addition & 1 deletion create-plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def register(self):
class {name}TestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
'''


Expand Down
30 changes: 14 additions & 16 deletions pdc_client/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,20 @@ def __init__(self):
self.plugins = []
self.logger = logging.getLogger('pdc')

def load_plugins(self, isTest):
def load_plugins(self):
config = None
if not isTest:
args = sys.argv[1:]
try:
idx = args.index("-s")
server = args[idx + 1]
except ValueError:
raise Exception('Server must be specified')
except IndexError:
raise Exception('Server must be specified')
config = pdc_client.read_config_file(server)
if not config:
raise Exception('No configuration for server %s.' % server)

server = None
plugins = DEFAULT_PLUGINS
args = sys.argv[1:]
try:
idx = args.index("-s")
server = args[idx + 1]
except ValueError:
pass
except IndexError:
pass
if server:
config = pdc_client.read_config_file(server)
if config and config.get(CONFIG_PLUGINS_KEY_NAME):
plugins = config.get(CONFIG_PLUGINS_KEY_NAME)
if not isinstance(plugins, list):
Expand Down Expand Up @@ -111,8 +109,8 @@ def run_hook(self, hook, *args, **kwargs):
self.logger.debug('Calling hook {0} in plugin {1}'.format(hook, plugin.__name__))
getattr(plugin, hook)(*args, **kwargs)

def setup(self, isTest=False):
self.load_plugins(isTest)
def setup(self):
self.load_plugins()

self.parser = argparse.ArgumentParser(description='PDC Client')
self.parser.add_argument('-s', '--server', default='stage',
Expand Down
2 changes: 1 addition & 1 deletion tests/build_image/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class BuildImageTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()

def _setup_list_1(self, api):
api.add_endpoint('build-images', 'GET', [
Expand Down
2 changes: 1 addition & 1 deletion tests/build_image_rtt_tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class BuildImageRttTestsTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.detail = {
"id": 3,
"build_nvr": "EjaErg-1",
Expand Down
4 changes: 2 additions & 2 deletions tests/component/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class GlobalComponentTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.detail = {
'id': '1',
'name': 'Test Global Component',
Expand Down Expand Up @@ -165,7 +165,7 @@ def test_list_json(self, api):
class ReleaseComponentTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.detail = {
'id': '1',
'release': {
Expand Down
2 changes: 1 addition & 1 deletion tests/compose/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class ComposeTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.compose_detail = {
"compose_id": "awesome-product-20130203.7",
"compose_date": "2013-02-03",
Expand Down
2 changes: 1 addition & 1 deletion tests/compose_image_rtt_tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class ComposeImageRTTTestsTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()

def _setup_list(self, api):
api.add_endpoint('compose-image-rtt-tests', 'GET', [
Expand Down
2 changes: 1 addition & 1 deletion tests/compose_tree_locations/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class ComposeTreeLocationsTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.compose_tree_location_detail = {"arch": "x86_64",
"compose": "Awesome-product-7.0-0",
"variant": "Server",
Expand Down
4 changes: 2 additions & 2 deletions tests/contact/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class GlobalComponentContactTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.detail = {
'id': '1',
'component': 'Test Global Component',
Expand Down Expand Up @@ -116,7 +116,7 @@ def test_list_json(self, api):
class ReleaseComponentContactTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.detail = {
'id': '1',
'component': {
Expand Down
2 changes: 1 addition & 1 deletion tests/image/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class ImageTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()

def _setup_list(self, api):
api.add_endpoint('images', 'GET', [
Expand Down
2 changes: 1 addition & 1 deletion tests/permission/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class PermissionTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()

def _setup_list(self, api):
api.add_endpoint('auth/current-user', 'GET',
Expand Down
2 changes: 1 addition & 1 deletion tests/release/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class ReleaseTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.release_detail = {
'release_id': 'release-1.0',
'active': True,
Expand Down
2 changes: 1 addition & 1 deletion tests/repo/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class RepoTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()
self.maxDiff = None

def test_list_without_filters(self, api):
Expand Down
2 changes: 1 addition & 1 deletion tests/rpm/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class RpmTestCase(CLITestCase):
def setUp(self):
self.runner = Runner()
self.runner.setup(True)
self.runner.setup()

def test_list_without_filters(self, api):
with self.expect_failure():
Expand Down

0 comments on commit 1f11f88

Please sign in to comment.