diff options
Diffstat (limited to 'tests/unit/cloudsearch2/test_search.py')
| -rw-r--r-- | tests/unit/cloudsearch2/test_search.py | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/tests/unit/cloudsearch2/test_search.py b/tests/unit/cloudsearch2/test_search.py index 2fab1158..8fa611d8 100644 --- a/tests/unit/cloudsearch2/test_search.py +++ b/tests/unit/cloudsearch2/test_search.py @@ -1,4 +1,6 @@ #!/usr/bin env python +from boto.cloudsearch2.domain import Domain +from boto.cloudsearch2.layer1 import CloudSearchConnection from tests.compat import mock, unittest from httpretty import HTTPretty @@ -7,6 +9,9 @@ import json from boto.cloudsearch2.search import SearchConnection, SearchServiceException from boto.compat import six, map +from tests.unit import AWSMockServiceTestCase +from tests.unit.cloudsearch2 import DEMO_DOMAIN_DATA +from tests.unit.cloudsearch2.test_connection import TestCloudSearchCreateDomain HOSTNAME = "search-demo-userdomain.us-east-1.cloudsearch.amazonaws.com" FULL_URL = 'http://%s/2013-01-01/search' % HOSTNAME @@ -111,11 +116,12 @@ class CloudSearchSearchTest(CloudSearchSearchBaseTest): def test_cloudsearch_qsearch(self): search = SearchConnection(endpoint=HOSTNAME) - search.search(q='Test') + search.search(q='Test', options='TestOptions') args = self.get_args(HTTPretty.last_request.raw_requestline) self.assertEqual(args[b'q'], [b"Test"]) + self.assertEqual(args[b'q.options'], [b"TestOptions"]) self.assertEqual(args[b'start'], [b"0"]) self.assertEqual(args[b'size'], [b"10"]) @@ -333,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() @@ -366,3 +373,15 @@ class CloudSearchConnectionTest(unittest.TestCase): self.assertTrue('Unknown error' in str(cm.exception)) self.assertTrue('went wrong. Oops' in str(cm.exception)) + + def test_proxy(self): + 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'}) |