openstack
/
sahara
Code Issues Proposed changes

Merge "Move integration tests to python-saharaclient 0.6.0"

This commit is contained in:
Jenkins 2014-03-20 16:06:33 +00:00 committed by Gerrit Code Review
parent 7e5540c641 d3e0538d8d
commit 5d17bf43f7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sahara/tests/integration/tests/base.py
View File

@ -21,7 +21,7 @@ import uuid
from neutronclient.v2_0 import client as neutron_client
from novaclient.v1_1 import client as nova_client
import savannaclient.client as savanna_client
import saharaclient.client as sahara_client
from swiftclient import client as swift_client
import unittest2
@ -64,13 +64,13 @@ class ITestCase(unittest2.TestCase):
self.common_config.SAHARA_HOST, self.common_config.SAHARA_PORT
)
self.sahara = savanna_client.Client(
self.common_config.SAHARA_API_VERSION,
self.sahara = sahara_client.Client(
version=self.common_config.SAHARA_API_VERSION,
username=self.common_config.OS_USERNAME,
api_key=self.common_config.OS_PASSWORD,
project_name=self.common_config.OS_TENANT_NAME,
auth_url=self.common_config.OS_AUTH_URL,
savanna_url='http://%s:%s/v%s/%s' % (
sahara_url='http://%s:%s/v%s/%s' % (
self.common_config.SAHARA_HOST,
self.common_config.SAHARA_PORT,
self.common_config.SAHARA_API_VERSION,

2
test-requirements.txt
View File

@ -17,4 +17,4 @@ testscenarios>=0.4
testtools>=0.9.34
unittest2
python-savannaclient>=0.5.0
python-saharaclient>=0.6.0