Use RegionInfo by default with heuristics

2 files changed, 23 insertions, 0 deletions

diff --git a/tests/unit/test_connect_to_region.py b/tests/unit/test_connect_to_region.py
index f7944b32..5f28112f 100644
--- a/tests/unit/test_connect_to_region.py
+++ b/tests/unit/test_connect_to_region.py
@@ -19,6 +19,8 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
+import os
+
 from tests.unit import unittest
 
 
@@ -191,6 +193,16 @@ class TestDynamodb2Connection(unittest.TestCase):
         self.assertIsInstance(connection, DynamoDBConnection)
         self.assertEqual(connection.host, 'dynamodb.us-east-1.amazonaws.com')
 
+    def test_connect_to_unkown_region(self):
+        from boto.dynamodb2 import connect_to_region
+        from boto.dynamodb2.layer1 import DynamoDBConnection
+        os.environ['BOTO_USE_ENDPOINT_HEURISTICS'] = 'True'
+        connection = connect_to_region(
+            'us-east-45', aws_access_key_id='foo',
+            aws_secret_access_key='bar')
+        self.assertIsInstance(connection, DynamoDBConnection)
+        self.assertEqual(connection.host, 'dynamodb.us-east-45.amazonaws.com')
+
 
 class TestEC2Connection(unittest.TestCase):
     def test_connect_to_region(self):
diff --git a/tests/unit/test_regioninfo.py b/tests/unit/test_regioninfo.py
index cff52be8..da73cb9b 100644
--- a/tests/unit/test_regioninfo.py
+++ b/tests/unit/test_regioninfo.py
@@ -200,6 +200,17 @@ class TestConnectToRegion(unittest.TestCase):
         expected_endpoint = 'ec2.us-southeast-43.amazonaws.com'
         self.assertEqual(connection.region.endpoint, expected_endpoint)
 
+    def test_connect_with_hueristics_without_explicit_regioninfo(self):
+        os.environ['BOTO_USE_ENDPOINT_HEURISTICS'] = 'True'
+        self.addCleanup(os.environ.pop, 'BOTO_USE_ENDPOINT_HEURISTICS')
+        connection = connect(
+            'ec2', 'us-southeast-43', connection_cls=FakeConn)
+        self.assertIsNotNone(connection)
+        self.assertIsInstance(connection.region, RegionInfo)
+        self.assertEqual(connection.region.name, 'us-southeast-43')
+        expected_endpoint = 'ec2.us-southeast-43.amazonaws.com'
+        self.assertEqual(connection.region.endpoint, expected_endpoint)
+
 
 if __name__ == '__main__':
     unittest.main()