Author: tomaz
Date: Mon Dec 5 22:11:43 2011
New Revision: 1210667
URL: http://svn.apache.org/viewvc?rev=1210667&view=rev
Log:
Update Rackspace test fixtures to work with the new endpoints URL.
Modified:
libcloud/trunk/test/compute/test_deployment.py
libcloud/trunk/test/compute/test_openstack.py
libcloud/trunk/test/dns/test_rackspace.py
libcloud/trunk/test/loadbalancer/test_rackspace.py
libcloud/trunk/test/storage/test_cloudfiles.py
Modified: libcloud/trunk/test/compute/test_deployment.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_deployment.py?rev=1210667&r1=1210666&r2=1210667&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_deployment.py (original)
+++ libcloud/trunk/test/compute/test_deployment.py Mon Dec 5 22:11:43 2011
@@ -333,7 +333,7 @@ class RackspaceMockHttp(MockHttp):
fixtures = ComputeFileFixtures('openstack')
auth_fixtures = OpenStackFixtures()
- def _v1_1__auth(self, method, url, body, headers):
+ def _v1_1_auth(self, method, url, body, headers):
body = self.auth_fixtures.load('_v1_1__auth.json')
return (httplib.OK, body, {'content-type': 'application/json;
charset=UTF-8'}, httplib.responses[httplib.OK])
Modified: libcloud/trunk/test/compute/test_openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_openstack.py?rev=1210667&r1=1210666&r2=1210667&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_openstack.py (original)
+++ libcloud/trunk/test/compute/test_openstack.py Mon Dec 5 22:11:43 2011
@@ -465,19 +465,19 @@ class OpenStackMockHttp(MockHttpTestCase
headers.update(XML_HEADERS)
return (httplib.OK, body, headers, httplib.responses[httplib.OK])
- def _v1_1__auth(self, method, url, body, headers):
+ def _v1_1_auth(self, method, url, body, headers):
body = self.auth_fixtures.load('_v1_1__auth.json')
return (httplib.OK, body, self.json_content_headers,
httplib.responses[httplib.OK])
- def _v1_1__auth_UNAUTHORIZED(self, method, url, body, headers):
+ def _v1_1_auth_UNAUTHORIZED(self, method, url, body, headers):
body = self.auth_fixtures.load('_v1_1__auth_unauthorized.json')
return (httplib.UNAUTHORIZED, body, self.json_content_headers,
httplib.responses[httplib.UNAUTHORIZED])
- def _v1_1__auth_UNAUTHORIZED_MISSING_KEY(self, method, url, body, headers):
+ def _v1_1_auth_UNAUTHORIZED_MISSING_KEY(self, method, url, body, headers):
body = self.auth_fixtures.load('_v1_1__auth_mssing_token.json')
return (httplib.OK, body, self.json_content_headers,
httplib.responses[httplib.OK])
- def _v1_1__auth_INTERNAL_SERVER_ERROR(self, method, url, body, headers):
+ def _v1_1_auth_INTERNAL_SERVER_ERROR(self, method, url, body, headers):
return (httplib.INTERNAL_SERVER_ERROR, "<h1>500: Internal Server
Error</h1>", {'content-type': 'text/html'},
httplib.responses[httplib.INTERNAL_SERVER_ERROR])
class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin):
@@ -698,7 +698,7 @@ class OpenStack_1_1_MockHttp(MockHttpTes
body = self.auth_fixtures.load('_v2_0__auth.json')
return (httplib.OK, body, self.json_content_headers,
httplib.responses[httplib.OK])
- def _v1_0_(self, method, url, body, headers):
+ def _v1_0(self, method, url, body, headers):
headers = {
'x-auth-token': 'FE011C19-CF86-4F87-BE5D-9229145D7A06',
'x-server-management-url': 'https://api.example.com/v1.1/slug',
Modified: libcloud/trunk/test/dns/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/dns/test_rackspace.py?rev=1210667&r1=1210666&r2=1210667&view=diff
==============================================================================
--- libcloud/trunk/test/dns/test_rackspace.py (original)
+++ libcloud/trunk/test/dns/test_rackspace.py Mon Dec 5 22:11:43 2011
@@ -271,7 +271,7 @@ class RackspaceMockHttp(MockHttp):
base_headers = {'content-type': 'application/json'}
# fake auth token response
- def _v1_1__auth(self, method, url, body, headers):
+ def _v1_1_auth(self, method, url, body, headers):
body = self.fixtures.load('auth_1_1.json')
headers = {'content-length': '657', 'vary': 'Accept,Accept-Encoding',
'server': 'Apache/2.2.13 (Red Hat)',
Modified: libcloud/trunk/test/loadbalancer/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_rackspace.py?rev=1210667&r1=1210666&r2=1210667&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_rackspace.py (original)
+++ libcloud/trunk/test/loadbalancer/test_rackspace.py Mon Dec 5 22:11:43 2011
@@ -188,7 +188,7 @@ class RackspaceLBMockHttp(MockHttpTestCa
raise NotImplementedError
- def _v1_1__auth(self, method, url, body, headers):
+ def _v1_1_auth(self, method, url, body, headers):
headers = { 'content-type': 'application/json; charset=UTF-8'}
body = self.auth_fixtures.load('_v1_1__auth.json')
return (httplib.OK, body, headers, httplib.responses[httplib.OK])
Modified: libcloud/trunk/test/storage/test_cloudfiles.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/storage/test_cloudfiles.py?rev=1210667&r1=1210666&r2=1210667&view=diff
==============================================================================
--- libcloud/trunk/test/storage/test_cloudfiles.py (original)
+++ libcloud/trunk/test/storage/test_cloudfiles.py Mon Dec 5 22:11:43 2011
@@ -631,7 +631,7 @@ class CloudFilesMockHttp(StorageMockHttp
return (status_code, body, headers, httplib.responses[httplib.OK])
- def _v1_1__auth(self, method, url, body, headers):
+ def _v1_1_auth(self, method, url, body, headers):
body = self.auth_fixtures.load('_v1_1__auth.json')
return (httplib.OK, body, {'content-type': 'application/json;
charset=UTF-8'}, httplib.responses[httplib.OK])
