diff --git a/requirements.txt b/requirements.txt index 4cc9d42..1329e07 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ Babel>=1.3 fixtures>=0.3.14 oslo.config>=1.4.0.0a3 iso8601>=0.1.9 +testresources>=0.2.4 diff --git a/tempest_lib/cli/base.py b/tempest_lib/cli/base.py index 7b9b3bf..1e32c06 100644 --- a/tempest_lib/cli/base.py +++ b/tempest_lib/cli/base.py @@ -20,6 +20,7 @@ import subprocess import testtools +from tempest_lib import base import tempest_lib.cli.output_parser from tempest_lib import exceptions from tempest_lib.openstack.common import log as logging @@ -92,7 +93,6 @@ class CLIClientBase(object): def __init__(self, username='', password='', tenant_name='', uri='', cli_dir='', *args, **kwargs): super(CLIClientBase, self).__init__() - self.parser = tempest_lib.cli.output_parser self.cli_dir = cli_dir if cli_dir else '/usr/bin' self.username = username self.tenant_name = tenant_name @@ -190,3 +190,14 @@ class CLIClientBase(object): self.assertTrue(lines[0].startswith(beginning), msg=('Beginning of first line has invalid content: %s' % lines[:3])) + + +class ClientTestBase(base.BaseTestCase): + + def setUp(self): + super(ClientTestBase, self).setUp() + self.clients = self._get_clients() + self.parser = tempest_lib.cli.output_parser + + def _get_clients(self): + raise NotImplementedError