summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authornash e. foster <nash.foster@avalara.com>2014-08-18 16:40:00 -0700
committernash e. foster <nash.foster@avalara.com>2014-08-18 16:40:00 -0700
commite57b7fc31ae237df5439459d602651ed3cc10557 (patch)
tree649f49df761e4e0883caba05c938837c1f9d6314 /tests
parent3cbbc21b61852738adbeda837588b60b5857ce68 (diff)
downloadboto-e57b7fc31ae237df5439459d602651ed3cc10557.tar.gz
Fix Listener class's __getitem__ method to return the correct data. Add a test for same.
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/ec2/elb/test_listener.py24
-rw-r--r--tests/unit/test_connection.py2
2 files changed, 25 insertions, 1 deletions
diff --git a/tests/unit/ec2/elb/test_listener.py b/tests/unit/ec2/elb/test_listener.py
index 16aa67fc..a9d29c5b 100644
--- a/tests/unit/ec2/elb/test_listener.py
+++ b/tests/unit/ec2/elb/test_listener.py
@@ -4,6 +4,7 @@ from tests.unit import unittest
import boto.resultset
from boto.ec2.elb.loadbalancer import LoadBalancer
+from boto.ec2.elb.listener import Listener
LISTENERS_RESPONSE = b"""<?xml version="1.0" encoding="UTF-8"?>
@@ -96,6 +97,29 @@ class TestListenerResponseParsing(unittest.TestCase):
]
)
+class TestListenerGetItem(unittest.TestCase):
+ def test_getitem_for_http_listener(self):
+ listener = Listener(load_balancer_port=80,
+ instance_port=80,
+ protocol='HTTP',
+ instance_protocol='HTTP')
+ self.assertEqual(listener[0], 80)
+ self.assertEqual(listener[1], 80)
+ self.assertEqual(listener[2], 'HTTP')
+ self.assertEqual(listener[3], 'HTTP')
+
+ def test_getitem_for_https_listener(self):
+ listener = Listener(load_balancer_port=443,
+ instance_port=80,
+ protocol='HTTPS',
+ instance_protocol='HTTP',
+ ssl_certificate_id='look_at_me_im_an_arn')
+ self.assertEqual(listener[0], 443)
+ self.assertEqual(listener[1], 80)
+ self.assertEqual(listener[2], 'HTTPS')
+ self.assertEqual(listener[3], 'HTTP')
+ self.assertEqual(listener[4], 'look_at_me_im_an_arn')
+
if __name__ == '__main__':
unittest.main()
diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py
index 97514361..5cd08860 100644
--- a/tests/unit/test_connection.py
+++ b/tests/unit/test_connection.py
@@ -343,7 +343,7 @@ class TestAWSQueryConnectionSimple(TestAWSQueryConnection):
{'par1': 'foo', 'par2': 'baz'},
"/",
"POST")
-
+ print resp.read()
self.assertEqual(resp.read(), b'{"test": "normal"}')
def test_alternate_port(self):