Author: tomaz
Date: Wed Dec 26 23:15:34 2012
New Revision: 1426087
URL: http://svn.apache.org/viewvc?rev=1426087&view=rev
Log:
Fix some broken tests so they work correctly with 2.5 and 3.2.
Modified:
libcloud/trunk/libcloud/compute/drivers/ec2.py
libcloud/trunk/libcloud/test/compute/test_ec2.py
libcloud/trunk/libcloud/test/storage/test_s3.py
Modified: libcloud/trunk/libcloud/compute/drivers/ec2.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ec2.py?rev=1426087&r1=1426086&r2=1426087&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ec2.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ec2.py Wed Dec 26 23:15:34 2012
@@ -315,7 +315,7 @@ REGION_DETAILS = {
}
VALID_EC2_DATACENTERS = REGION_DETAILS.keys()
-VALID_EC2_DATACENTERS.remove('nimbus')
+VALID_EC2_DATACENTERS = [d for d in VALID_EC2_DATACENTERS if d != 'nimbus']
class EC2NodeLocation(NodeLocation):
Modified: libcloud/trunk/libcloud/test/compute/test_ec2.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/compute/test_ec2.py?rev=1426087&r1=1426086&r2=1426087&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/compute/test_ec2.py (original)
+++ libcloud/trunk/libcloud/test/compute/test_ec2.py Wed Dec 26 23:15:34 2012
@@ -41,7 +41,7 @@ from libcloud.test.secrets import EC2_PA
class BaseEC2Tests(LibcloudTestCase):
def test_instantiate_driver_valid_datacenters(self):
datacenters = REGION_DETAILS.keys()
- datacenters.remove('nimbus')
+ datacenters = [d for d in datacenters if d != 'nimbus']
for datacenter in datacenters:
EC2NodeDriver(*EC2_PARAMS, **{'datacenter': datacenter})
Modified: libcloud/trunk/libcloud/test/storage/test_s3.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/storage/test_s3.py?rev=1426087&r1=1426086&r2=1426087&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/storage/test_s3.py (original)
+++ libcloud/trunk/libcloud/test/storage/test_s3.py Wed Dec 26 23:15:34 2012
@@ -41,6 +41,13 @@ from libcloud.test.file_fixtures import
from libcloud.test.secrets import STORAGE_S3_PARAMS
+try:
+ parse_qs = urlparse.parse_qs
+except AttributeError:
+ import cgi
+ parse_qs = cgi.parse_qs
+
+
class S3MockHttp(StorageMockHttp, MockHttpTestCase):
fixtures = StorageFileFixtures('s3')
@@ -200,7 +207,7 @@ class S3MockHttp(StorageMockHttp, MockHt
TEST_ID = 'VXBsb2FkIElEIGZvciA2aWWpbmcncyBteS1tb3ZpZS5tMnRzIHVwbG9hZA'
query_string = urlparse.urlsplit(url).query
- query = urlparse.parse_qs(query_string)
+ query = parse_qs(query_string)
if not query.get('uploadId', False):
self.fail('Request doesnt contain uploadId query parameter')
@@ -252,7 +259,7 @@ class S3MockHttp(StorageMockHttp, MockHt
def _foo_bar_container_LIST_MULTIPART(self, method, url, body, headers):
query_string = urlparse.urlsplit(url).query
- query = urlparse.parse_qs(query_string)
+ query = parse_qs(query_string)
if 'key-marker' not in query:
body = self.fixtures.load('list_multipart_1.xml')
