Use mock connections instead of real ones in tests

2 files changed, 20 insertions, 13 deletions

diff --git a/tests/unit/cloudsearch2/test_document.py b/tests/unit/cloudsearch2/test_document.py
index c1433b18..dac4aa64 100644
--- a/tests/unit/cloudsearch2/test_document.py
+++ b/tests/unit/cloudsearch2/test_document.py
@@ -2,7 +2,7 @@
 from boto.cloudsearch2.domain import Domain
 from boto.cloudsearch2.layer1 import CloudSearchConnection
 
-from tests.unit import unittest
+from tests.unit import unittest, AWSMockServiceTestCase
 from httpretty import HTTPretty
 from mock import MagicMock
 
@@ -16,13 +16,17 @@ import boto
 from tests.unit.cloudsearch2 import DEMO_DOMAIN_DATA
 
 
-class CloudSearchDocumentConnectionTest(unittest.TestCase):
+class CloudSearchDocumentConnectionTest(AWSMockServiceTestCase):
+    connection_class = CloudSearchConnection
+
     def test_proxy(self):
-        conn = CloudSearchConnection(
-            proxy="127.0.0.1",
-            proxy_user="john.doe",
-            proxy_pass="p4ssw0rd",
-            proxy_port="8180")
+        conn = self.service_connection
+        conn.proxy = "127.0.0.1"
+        conn.proxy_user = "john.doe"
+        conn.proxy_pass="p4ssw0rd"
+        conn.proxy_port="8180"
+        conn.use_proxy = True
+
         domain = Domain(conn, DEMO_DOMAIN_DATA)
         service = DocumentServiceConnection(domain=domain)
         self.assertEqual(service.proxy, {'http': 'http://john.doe:p4ssw0rd@127.0.0.1:8180'})
diff --git a/tests/unit/cloudsearch2/test_search.py b/tests/unit/cloudsearch2/test_search.py
index a01e2074..8fa611d8 100644
--- a/tests/unit/cloudsearch2/test_search.py
+++ b/tests/unit/cloudsearch2/test_search.py
@@ -339,8 +339,9 @@ class FakeResponse(object):
     content = b''
 
 
-class CloudSearchConnectionTest(unittest.TestCase):
+class CloudSearchConnectionTest(AWSMockServiceTestCase):
     cloudsearch = True
+    connection_class = CloudSearchConnection
 
     def setUp(self):
         super(CloudSearchConnectionTest, self).setUp()
@@ -374,11 +375,13 @@ class CloudSearchConnectionTest(unittest.TestCase):
             self.assertTrue('went wrong. Oops' in str(cm.exception))
 
     def test_proxy(self):
-        conn = CloudSearchConnection(
-                proxy="127.0.0.1",
-                proxy_user="john.doe",
-                proxy_pass="p4ssw0rd",
-                proxy_port="8180")
+        conn = self.service_connection
+        conn.proxy = "127.0.0.1"
+        conn.proxy_user = "john.doe"
+        conn.proxy_pass="p4ssw0rd"
+        conn.proxy_port="8180"
+        conn.use_proxy = True
+
         domain = Domain(conn, DEMO_DOMAIN_DATA)
         search = SearchConnection(domain=domain)
         self.assertEqual(search.session.proxies, {'http': 'http://john.doe:p4ssw0rd@127.0.0.1:8180'})