openstack/deb-sahara
Code Issues Proposed changes

Merge "Fix working scenario tests with swiftclient"

Browse Source
This commit is contained in:
Jenkins 2015-09-21 18:29:32 +00:00 committed by Gerrit Code Review
commit 042578e31c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/tests/scenario/base.py
View File

@ -124,7 +124,7 @@ class BaseTestCase(base.BaseTestCase):
authurl=auth_url, authurl=auth_url,
user=username, user=username,
key=password, key=password,
insecure=self.credentials['ssl_verify'], insecure=not self.credentials['ssl_verify'],
cacert=self.credentials['ssl_cert'], cacert=self.credentials['ssl_cert'],
tenant_name=tenant_name) tenant_name=tenant_name)

2
sahara/tests/scenario_unit/test_base.py
View File

@ -172,7 +172,7 @@ class TestBase(testtools.TestCase):
swift.assert_called_with(auth_version='2.0', swift.assert_called_with(auth_version='2.0',
user='admin', user='admin',
key='nova', key='nova',
insecure=True, insecure=False,
cacert='/etc/tests/cert.crt', cacert='/etc/tests/cert.crt',
tenant_name='admin', tenant_name='admin',
authurl='http://localhost:5000/v2.0') authurl='http://localhost:5000/v2.0')