From 4953e25e0d1f14113e4cc22ce07c4358a1364ea3 Mon Sep 17 00:00:00 2001 From: Ajay Yadav Date: Wed, 18 Jun 2014 12:01:43 +0530 Subject: [PATCH] Add three new CLI tests of sahara This patch adds test cases for sahara CLI Positional arguments: 1. bash-completion 2. help This patch adds test cases for sahara CLI Optional arguments: 1. version Partially implements: blueprint cli-tests-coverage Change-Id: I59c7dd34cdb625eba370aa2a02c7cd25f713fcc0 --- tempest/cli/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tempest/cli/__init__.py b/tempest/cli/__init__.py index 6aa98c4..d10dd19 100644 --- a/tempest/cli/__init__.py +++ b/tempest/cli/__init__.py @@ -89,14 +89,15 @@ class ClientTestBase(tempest.test.BaseTestCase): return self.cmd_with_auth( 'neutron', action, flags, params, admin, fail_ok) - def sahara(self, action, flags='', params='', admin=True, fail_ok=False): + def sahara(self, action, flags='', params='', admin=True, + fail_ok=False, merge_stderr=True): """Executes sahara command for the given action.""" flags += ' --endpoint-type %s' % CONF.data_processing.endpoint_type return self.cmd_with_auth( - 'sahara', action, flags, params, admin, fail_ok) + 'sahara', action, flags, params, admin, fail_ok, merge_stderr) def cmd_with_auth(self, cmd, action, flags='', params='', - admin=True, fail_ok=False): + admin=True, fail_ok=False, merge_stderr=False): """Executes given command with auth attributes appended.""" # TODO(jogo) make admin=False work creds = ('--os-username %s --os-tenant-name %s --os-password %s ' @@ -106,7 +107,7 @@ class ClientTestBase(tempest.test.BaseTestCase): CONF.identity.admin_password, CONF.identity.uri)) flags = creds + ' ' + flags - return self.cmd(cmd, action, flags, params, fail_ok) + return self.cmd(cmd, action, flags, params, fail_ok, merge_stderr) def cmd(self, cmd, action, flags='', params='', fail_ok=False, merge_stderr=False):