openstack
/
keystone
Code Issues Proposed changes

Do not run git-cloned ksc master tests when local client specified 

There is no reason to run both the KSC Master test and a locally
specified keystoneclient. If the local keystoneclient path is set
only use the KcOptTestCase not the KcMasterTestCase.

Change-Id: Ib9a1e06b2e760a97e3318263b85631c436e23141
Closes-bug: #1371428
This commit is contained in:
Morgan Fainberg 2014-09-19 08:12:23 -07:00
parent ee4ee3b7f5
commit bd3b5ce25f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/tests/test_keystoneclient.py
View File

@ -1085,6 +1085,12 @@ class KeystoneClientTests(object):
class KcMasterTestCase(CompatTestCase, KeystoneClientTests):
checkout_info = (KEYSTONECLIENT_REPO, 'master')
def setUp(self):
if os.environ.get('KSCTEST_PATH'):
self.skip('KSCTEST_PATH env set, running tests with local '
'client instead.')
super(KcMasterTestCase, self).setUp()
class KcOptTestCase(KcMasterTestCase):
# Set KSCTEST_PATH to the keystoneclient directory, then run this test.