Merge pull request #35 from sopel/issue-34-fix-missing-ap-southeast-2

Fix missing support for ap-southeast-2
sopel · Apr 15, 2013 · cd7e864 · cd7e864
2 parents 49d7b6c + 7d4928b
commit cd7e864
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/botocross/s3/__init__.py b/botocross/s3/__init__.py
@@ -29,7 +29,8 @@
     'SAEast': 'sa-east-1',
     'EU': 'eu-west-1',
     'APNortheast': 'ap-northeast-1',
-    'APSoutheast': 'ap-southeast-1'}
+    'APSoutheast': 'ap-southeast-1',
+    'APSoutheast2': 'ap-southeast-2'}
 
 # NOTE: S3 region handling differs in an unfortunate way (likely a legacy issue) and requires special treatment.
 def class_iterator(Class):

diff --git a/tests/s3/test_package.py b/tests/s3/test_package.py
@@ -22,8 +22,9 @@
 import unittest
 
 class S3PackageTest(unittest.TestCase):
+    num_regions = 8;
 
     def test_region_map(self):
         from botocross.s3 import RegionMap
 
-        self.assertTrue(7 == len(RegionMap))
+        self.assertTrue(self.num_regions == len(RegionMap))
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -24,6 +24,7 @@
 log = logging.getLogger('botocross')
 
 class TestPackage(unittest.TestCase):
+    num_regions = 8;
 
     def test_configure_logging(self):
         from botocross import configure_logging
@@ -71,10 +72,10 @@ def test_build_filter_params_with_identical_keys(self):
 
     def test_filter_regions(self):
         from botocross import filter_regions
-        import boto.cloudformation
+        import boto.ec2
 
         log.info("Testing region filter:")
-        all_regions = boto.cloudformation.regions()
+        all_regions = boto.ec2.regions()
         filtered_regions = filter_regions(all_regions, "us-west-1")
         self.assertEquals(1, len(filtered_regions))
         filtered_regions = filter_regions(all_regions, "us-west")
@@ -84,7 +85,7 @@ def test_filter_regions(self):
         filtered_regions = filter_regions(all_regions, "west")
         self.assertEquals(3, len(filtered_regions))
         filtered_regions = filter_regions(all_regions, None)
-        self.assertEquals(7, len(filtered_regions))
+        self.assertEquals(self.num_regions, len(filtered_regions))
 
     def test_filter_regions_s3(self):
         from botocross import filter_regions_s3
@@ -101,4 +102,4 @@ def test_filter_regions_s3(self):
         filtered_regions = filter_regions_s3(all_regions, "west")
         self.assertEquals(3, len(filtered_regions))
         filtered_regions = filter_regions_s3(all_regions, None)
-        self.assertEquals(7, len(filtered_regions))
+        self.assertEquals(self.num_regions, len(filtered_regions))