Return-Path: X-Original-To: apmail-libcloud-commits-archive@www.apache.org Delivered-To: apmail-libcloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5158210456 for ; Fri, 25 Oct 2013 22:01:57 +0000 (UTC) Received: (qmail 86575 invoked by uid 500); 25 Oct 2013 22:01:52 -0000 Delivered-To: apmail-libcloud-commits-archive@libcloud.apache.org Received: (qmail 86428 invoked by uid 500); 25 Oct 2013 22:01:47 -0000 Mailing-List: contact commits-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list commits@libcloud.apache.org Received: (qmail 86276 invoked by uid 99); 25 Oct 2013 22:01:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Oct 2013 22:01:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8D7BF81E5EC; Fri, 25 Oct 2013 22:01:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Fri, 25 Oct 2013 22:01:42 -0000 Message-Id: <6014db523817453cb123e8615a8f09a2@git.apache.org> In-Reply-To: <6f58b1839120404794caa18b431da2ee@git.apache.org> References: <6f58b1839120404794caa18b431da2ee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/9] Add new "lint" target to tox, flake8 fixes in the whole codebase. http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/loadbalancer/test_rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_rackspace.py b/libcloud/test/loadbalancer/test_rackspace.py index 5d66ad2..1d183ec 100644 --- a/libcloud/test/loadbalancer/test_rackspace.py +++ b/libcloud/test/loadbalancer/test_rackspace.py @@ -26,7 +26,9 @@ from libcloud.utils.py3 import urlencode from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm from libcloud.loadbalancer.types import MemberCondition -from libcloud.loadbalancer.drivers.rackspace import RackspaceLBDriver, RackspaceHealthMonitor, RackspaceHTTPHealthMonitor, RackspaceConnectionThrottle, RackspaceAccessRule +from libcloud.loadbalancer.drivers.rackspace import RackspaceLBDriver, \ + RackspaceHealthMonitor, RackspaceHTTPHealthMonitor, \ + RackspaceConnectionThrottle, RackspaceAccessRule from libcloud.loadbalancer.drivers.rackspace import RackspaceUKLBDriver from libcloud.loadbalancer.drivers.rackspace import RackspaceAccessRuleType from libcloud.common.types import LibcloudError @@ -41,7 +43,7 @@ class RackspaceLBTests(unittest.TestCase): def setUp(self): RackspaceLBDriver.connectionCls.conn_classes = (None, - RackspaceLBMockHttp) + RackspaceLBMockHttp) RackspaceLBMockHttp.type = None self.driver = RackspaceLBDriver('user', 'key') self.driver.connection.poll_interval = 0.0 @@ -58,9 +60,9 @@ class RackspaceLBTests(unittest.TestCase): driver.list_balancers() self.assertEqual(kwargs['ex_force_auth_token'], - driver.connection.auth_token) + driver.connection.auth_token) self.assertEqual('/v1.0/11111', - driver.connection.request_path) + driver.connection.request_path) def test_force_auth_url_kwargs(self): kwargs = { @@ -70,27 +72,29 @@ class RackspaceLBTests(unittest.TestCase): driver = RackspaceLBDriver('user', 'key', **kwargs) self.assertEqual(kwargs['ex_force_auth_url'], - driver.connection._ex_force_auth_url) + driver.connection._ex_force_auth_url) self.assertEqual(kwargs['ex_force_auth_version'], - driver.connection._auth_version) + driver.connection._auth_version) def test_gets_auth_2_0_endpoint_defaults_to_ord_region(self): driver = RackspaceLBDriver('user', 'key', - ex_force_auth_version='2.0_password' - ) + ex_force_auth_version='2.0_password' + ) driver.connection._populate_hosts_and_request_paths() - self.assertEqual('https://ord.loadbalancers.api.rackspacecloud.com/v1.0/11111', + self.assertEqual( + 'https://ord.loadbalancers.api.rackspacecloud.com/v1.0/11111', driver.connection.get_endpoint()) def test_gets_auth_2_0_endpoint_for_dfw(self): driver = RackspaceLBDriver('user', 'key', - ex_force_auth_version='2.0_password', - ex_force_region='dfw' - ) + ex_force_auth_version='2.0_password', + ex_force_region='dfw' + ) driver.connection._populate_hosts_and_request_paths() - self.assertEqual('https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/11111', + self.assertEqual( + 'https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/11111', driver.connection.get_endpoint()) def test_list_protocols(self): @@ -148,12 +152,15 @@ class RackspaceLBTests(unittest.TestCase): def test_create_balancer(self): balancer = self.driver.create_balancer(name='test2', - port=80, - algorithm=Algorithm.ROUND_ROBIN, - members=(Member(None, '10.1.0.10', 80, extra={'condition': MemberCondition.DISABLED, - 'weight': 10}), - Member(None, '10.1.0.11', 80)) - ) + port=80, + algorithm=Algorithm.ROUND_ROBIN, + members=( + Member( + None, '10.1.0.10', 80, + extra={'condition': MemberCondition.DISABLED, + 'weight': 10}), + Member(None, '10.1.0.11', 80)) + ) self.assertEqual(balancer.name, 'test2') self.assertEqual(balancer.id, '8290') @@ -164,11 +171,13 @@ class RackspaceLBTests(unittest.TestCase): RackspaceLBMockHttp.type = None driver = RackspaceLBDriver('user', 'key') balancer = driver.ex_create_balancer(name='test2', - port=80, - algorithm=Algorithm.ROUND_ROBIN, - members=(Member(None, '10.1.0.11', 80),), - vip='12af' - ) + port=80, + algorithm=Algorithm.ROUND_ROBIN, + members=( + Member( + None, '10.1.0.11', 80),), + vip='12af' + ) self.assertEqual(balancer.name, 'test2') self.assertEqual(balancer.id, '8290') @@ -193,10 +202,10 @@ class RackspaceLBTests(unittest.TestCase): def test_get_balancer_extra_vips(self): balancer = self.driver.get_balancer(balancer_id='18940') self.assertEqual(balancer.extra["virtualIps"], - [{"address":"50.56.49.149", - "id":2359, - "type":"PUBLIC", - "ipVersion":"IPV4"}]) + [{"address": "50.56.49.149", + "id": 2359, + "type": "PUBLIC", + "ipVersion": "IPV4"}]) def test_get_balancer_extra_public_source_ipv4(self): balancer = self.driver.get_balancer(balancer_id='18940') @@ -205,7 +214,7 @@ class RackspaceLBTests(unittest.TestCase): def test_get_balancer_extra_public_source_ipv6(self): balancer = self.driver.get_balancer(balancer_id='18940') self.assertEqual(balancer.extra["ipv6PublicSource"], - '2001:4801:7901::6/64') + '2001:4801:7901::6/64') def test_get_balancer_extra_private_source_ipv4(self): balancer = self.driver.get_balancer(balancer_id='18940') @@ -240,18 +249,18 @@ class RackspaceLBTests(unittest.TestCase): self.assertEqual(2883, access_list[0].id) self.assertEqual("0.0.0.0/0", access_list[0].address) self.assertEqual(RackspaceAccessRuleType.DENY, - access_list[0].rule_type) + access_list[0].rule_type) self.assertEqual(2884, access_list[1].id) self.assertEqual("2001:4801:7901::6/64", - access_list[1].address) + access_list[1].address) self.assertEqual(RackspaceAccessRuleType.ALLOW, - access_list[1].rule_type) + access_list[1].rule_type) self.assertEqual(3006, access_list[2].id) self.assertEqual("8.8.8.8/0", access_list[2].address) self.assertEqual(RackspaceAccessRuleType.DENY, - access_list[2].rule_type) + access_list[2].rule_type) def test_get_balancer_algorithm(self): balancer = self.driver.get_balancer(balancer_id='8290') @@ -264,12 +273,12 @@ class RackspaceLBTests(unittest.TestCase): def test_get_balancer_weighted_round_robin_algorithm(self): balancer = self.driver.get_balancer(balancer_id='94692') self.assertEqual(balancer.extra["algorithm"], - Algorithm.WEIGHTED_ROUND_ROBIN) + Algorithm.WEIGHTED_ROUND_ROBIN) def test_get_balancer_weighted_least_connections_algorithm(self): balancer = self.driver.get_balancer(balancer_id='94693') self.assertEqual(balancer.extra["algorithm"], - Algorithm.WEIGHTED_LEAST_CONNECTIONS) + Algorithm.WEIGHTED_LEAST_CONNECTIONS) def test_get_balancer_unknown_algorithm(self): balancer = self.driver.get_balancer(balancer_id='94694') @@ -283,7 +292,7 @@ class RackspaceLBTests(unittest.TestCase): self.assertEqual(balancer_health_monitor.delay, 10) self.assertEqual(balancer_health_monitor.timeout, 5) self.assertEqual(balancer_health_monitor.attempts_before_deactivation, - 2) + 2) def test_get_balancer_http_health_monitor(self): balancer = self.driver.get_balancer(balancer_id='94696') @@ -293,12 +302,12 @@ class RackspaceLBTests(unittest.TestCase): self.assertEqual(balancer_health_monitor.delay, 10) self.assertEqual(balancer_health_monitor.timeout, 5) self.assertEqual(balancer_health_monitor.attempts_before_deactivation, - 2) + 2) self.assertEqual(balancer_health_monitor.path, "/") self.assertEqual(balancer_health_monitor.status_regex, - "^[234][0-9][0-9]$") + "^[234][0-9][0-9]$") self.assertEqual(balancer_health_monitor.body_regex, - "Hello World!") + "Hello World!") def test_get_balancer_https_health_monitor(self): balancer = self.driver.get_balancer(balancer_id='94697') @@ -308,10 +317,10 @@ class RackspaceLBTests(unittest.TestCase): self.assertEqual(balancer_health_monitor.delay, 15) self.assertEqual(balancer_health_monitor.timeout, 12) self.assertEqual(balancer_health_monitor.attempts_before_deactivation, - 5) + 5) self.assertEqual(balancer_health_monitor.path, "/test") self.assertEqual(balancer_health_monitor.status_regex, - "^[234][0-9][0-9]$") + "^[234][0-9][0-9]$") self.assertEqual(balancer_health_monitor.body_regex, "abcdef") def test_get_balancer_connection_throttle(self): @@ -322,12 +331,12 @@ class RackspaceLBTests(unittest.TestCase): self.assertEqual(balancer_connection_throttle.max_connections, 200) self.assertEqual(balancer_connection_throttle.max_connection_rate, 50) self.assertEqual(balancer_connection_throttle.rate_interval_seconds, - 10) + 10) def test_get_session_persistence(self): balancer = self.driver.get_balancer(balancer_id='94695') self.assertEqual(balancer.extra["sessionPersistenceType"], - "HTTP_COOKIE") + "HTTP_COOKIE") def test_get_connection_logging(self): balancer = self.driver.get_balancer(balancer_id='94695') @@ -354,7 +363,7 @@ class RackspaceLBTests(unittest.TestCase): balancer = self.driver.get_balancer(balancer_id='94698') rule = RackspaceAccessRule(rule_type=RackspaceAccessRuleType.DENY, - address='0.0.0.0/0') + address='0.0.0.0/0') rule = self.driver.ex_create_balancer_access_rule(balancer, rule) @@ -364,10 +373,10 @@ class RackspaceLBTests(unittest.TestCase): balancer = self.driver.get_balancer(balancer_id='94698') rule = RackspaceAccessRule(rule_type=RackspaceAccessRuleType.DENY, - address='0.0.0.0/0') + address='0.0.0.0/0') resp = self.driver.ex_create_balancer_access_rule_no_poll(balancer, - rule) + rule) self.assertTrue(resp) @@ -394,7 +403,7 @@ class RackspaceLBTests(unittest.TestCase): address='8.8.8.8/0')] resp = self.driver.ex_create_balancer_access_rules_no_poll(balancer, - rules) + rules) self.assertTrue(resp) @@ -402,9 +411,9 @@ class RackspaceLBTests(unittest.TestCase): balancer = self.driver.get_balancer(balancer_id='94698') rule = RackspaceAccessRule(id='1007', - rule_type=RackspaceAccessRuleType.ALLOW, - address="10.45.13.5/12" - ) + rule_type=RackspaceAccessRuleType.ALLOW, + address="10.45.13.5/12" + ) balancer = self.driver.ex_destroy_balancer_access_rule(balancer, rule) @@ -416,19 +425,19 @@ class RackspaceLBTests(unittest.TestCase): balancer = self.driver.get_balancer(balancer_id='94698') rule = RackspaceAccessRule(id=1007, - rule_type=RackspaceAccessRuleType.ALLOW, - address="10.45.13.5/12" - ) + rule_type=RackspaceAccessRuleType.ALLOW, + address="10.45.13.5/12" + ) resp = self.driver.ex_destroy_balancer_access_rule_no_poll(balancer, - rule) + rule) self.assertTrue(resp) def test_ex_destroy_balancer_access_rules(self): balancer = self.driver.get_balancer(balancer_id='94699') balancer = self.driver.ex_destroy_balancer_access_rules(balancer, - balancer.extra['accessList']) + balancer.extra['accessList']) self.assertEqual('94699', balancer.id) @@ -436,16 +445,17 @@ class RackspaceLBTests(unittest.TestCase): balancer = self.driver.get_balancer(balancer_id='94699') resp = self.driver.ex_destroy_balancer_access_rules_no_poll(balancer, - balancer.extra['accessList']) + balancer.extra['accessList']) self.assertTrue(resp) def test_ex_update_balancer_health_monitor(self): balancer = self.driver.get_balancer(balancer_id='94695') monitor = RackspaceHealthMonitor(type='CONNECT', delay=10, timeout=5, - attempts_before_deactivation=2) + attempts_before_deactivation=2) - balancer = self.driver.ex_update_balancer_health_monitor(balancer, monitor) + balancer = self.driver.ex_update_balancer_health_monitor( + balancer, monitor) updated_monitor = balancer.extra['healthMonitor'] self.assertEqual('CONNECT', updated_monitor.type) @@ -456,12 +466,13 @@ class RackspaceLBTests(unittest.TestCase): def test_ex_update_balancer_http_health_monitor(self): balancer = self.driver.get_balancer(balancer_id='94696') monitor = RackspaceHTTPHealthMonitor(type='HTTP', delay=10, timeout=5, - attempts_before_deactivation=2, - path='/', - status_regex='^[234][0-9][0-9]$', - body_regex='Hello World!') + attempts_before_deactivation=2, + path='/', + status_regex='^[234][0-9][0-9]$', + body_regex='Hello World!') - balancer = self.driver.ex_update_balancer_health_monitor(balancer, monitor) + balancer = self.driver.ex_update_balancer_health_monitor( + balancer, monitor) updated_monitor = balancer.extra['healthMonitor'] self.assertEqual('HTTP', updated_monitor.type) @@ -475,35 +486,36 @@ class RackspaceLBTests(unittest.TestCase): def test_ex_update_balancer_health_monitor_no_poll(self): balancer = self.driver.get_balancer(balancer_id='94695') monitor = RackspaceHealthMonitor(type='CONNECT', delay=10, timeout=5, - attempts_before_deactivation=2) + attempts_before_deactivation=2) resp = self.driver.ex_update_balancer_health_monitor_no_poll(balancer, - monitor) + monitor) self.assertTrue(resp) def test_ex_update_balancer_http_health_monitor_no_poll(self): balancer = self.driver.get_balancer(balancer_id='94696') monitor = RackspaceHTTPHealthMonitor(type='HTTP', delay=10, timeout=5, - attempts_before_deactivation=2, - path='/', - status_regex='^[234][0-9][0-9]$', - body_regex='Hello World!') + attempts_before_deactivation=2, + path='/', + status_regex='^[234][0-9][0-9]$', + body_regex='Hello World!') resp = self.driver.ex_update_balancer_health_monitor_no_poll(balancer, - monitor) + monitor) self.assertTrue(resp) def test_ex_update_balancer_http_health_monitor_with_no_option_body_regex(self): balancer = self.driver.get_balancer(balancer_id='94700') monitor = RackspaceHTTPHealthMonitor(type='HTTP', delay=10, timeout=5, - attempts_before_deactivation=2, - path='/', - status_regex='^[234][0-9][0-9]$', - body_regex='') + attempts_before_deactivation=2, + path='/', + status_regex='^[234][0-9][0-9]$', + body_regex='') - balancer = self.driver.ex_update_balancer_health_monitor(balancer, monitor) + balancer = self.driver.ex_update_balancer_health_monitor( + balancer, monitor) updated_monitor = balancer.extra['healthMonitor'] self.assertEqual('HTTP', updated_monitor.type) @@ -529,12 +541,12 @@ class RackspaceLBTests(unittest.TestCase): def test_ex_update_balancer_connection_throttle(self): balancer = self.driver.get_balancer(balancer_id='94695') connection_throttle = RackspaceConnectionThrottle(max_connections=200, - min_connections=50, - max_connection_rate=50, - rate_interval_seconds=10) + min_connections=50, + max_connection_rate=50, + rate_interval_seconds=10) balancer = self.driver.ex_update_balancer_connection_throttle(balancer, - connection_throttle) + connection_throttle) updated_throttle = balancer.extra['connectionThrottle'] self.assertEqual(200, updated_throttle.max_connections) @@ -545,9 +557,9 @@ class RackspaceLBTests(unittest.TestCase): def test_ex_update_balancer_connection_throttle_no_poll(self): balancer = self.driver.get_balancer(balancer_id='94695') connection_throttle = RackspaceConnectionThrottle(max_connections=200, - min_connections=50, - max_connection_rate=50, - rate_interval_seconds=10) + min_connections=50, + max_connection_rate=50, + rate_interval_seconds=10) resp = self.driver.ex_update_balancer_connection_throttle_no_poll( balancer, connection_throttle) @@ -645,7 +657,8 @@ class RackspaceLBTests(unittest.TestCase): def test_ex_disable_balancer_custom_error_page_no_poll(self): balancer = self.driver.get_balancer(balancer_id='94695') - resp = self.driver.ex_disable_balancer_custom_error_page_no_poll(balancer) + resp = self.driver.ex_disable_balancer_custom_error_page_no_poll( + balancer) self.assertTrue(resp) @@ -670,7 +683,7 @@ class RackspaceLBTests(unittest.TestCase): self.assertEqual(len(members), 3) self.assertEqual(members[0].balancer, balancer) self.assertEqual(expected, set(["%s:%s" % (member.ip, member.port) for - member in members])) + member in members])) def test_balancer_members_extra_weight(self): balancer = self.driver.get_balancer(balancer_id='8290') @@ -684,11 +697,11 @@ class RackspaceLBTests(unittest.TestCase): members = balancer.list_members() self.assertEqual(MemberCondition.ENABLED, - members[0].extra['condition']) + members[0].extra['condition']) self.assertEqual(MemberCondition.DISABLED, - members[1].extra['condition']) + members[1].extra['condition']) self.assertEqual(MemberCondition.DRAINING, - members[2].extra['condition']) + members[2].extra['condition']) def test_balancer_members_extra_status(self): balancer = self.driver.get_balancer(balancer_id='8290') @@ -755,106 +768,113 @@ class RackspaceLBTests(unittest.TestCase): def test_update_balancer_protocol(self): balancer = LoadBalancer(id='3130', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) - updated_balancer = self.driver.update_balancer(balancer, protocol='HTTPS') + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) + updated_balancer = self.driver.update_balancer( + balancer, protocol='HTTPS') self.assertEqual('HTTPS', updated_balancer.extra['protocol']) def test_update_balancer_protocol_to_imapv2(self): balancer = LoadBalancer(id='3135', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) - updated_balancer = self.driver.update_balancer(balancer, protocol='imapv2') + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) + updated_balancer = self.driver.update_balancer( + balancer, protocol='imapv2') self.assertEqual('IMAPv2', updated_balancer.extra['protocol']) def test_update_balancer_protocol_to_imapv3(self): balancer = LoadBalancer(id='3136', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) - updated_balancer = self.driver.update_balancer(balancer, protocol='IMAPV3') + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) + updated_balancer = self.driver.update_balancer( + balancer, protocol='IMAPV3') self.assertEqual('IMAPv3', updated_balancer.extra['protocol']) def test_update_balancer_protocol_to_imapv4(self): balancer = LoadBalancer(id='3137', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) - updated_balancer = self.driver.update_balancer(balancer, protocol='IMAPv4') + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) + updated_balancer = self.driver.update_balancer( + balancer, protocol='IMAPv4') self.assertEqual('IMAPv4', updated_balancer.extra['protocol']) def test_update_balancer_port(self): balancer = LoadBalancer(id='3131', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) updated_balancer = self.driver.update_balancer(balancer, port=1337) self.assertEqual(1337, updated_balancer.port) def test_update_balancer_name(self): balancer = LoadBalancer(id='3132', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) - updated_balancer = self.driver.update_balancer(balancer, name='new_lb_name') + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) + updated_balancer = self.driver.update_balancer( + balancer, name='new_lb_name') self.assertEqual('new_lb_name', updated_balancer.name) def test_update_balancer_algorithm(self): balancer = LoadBalancer(id='3133', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) updated_balancer = self.driver.update_balancer(balancer, algorithm=Algorithm.ROUND_ROBIN) - self.assertEqual(Algorithm.ROUND_ROBIN, updated_balancer.extra['algorithm']) + self.assertEqual( + Algorithm.ROUND_ROBIN, updated_balancer.extra['algorithm']) def test_update_balancer_bad_algorithm_exception(self): balancer = LoadBalancer(id='3134', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) try: self.driver.update_balancer(balancer, algorithm='HAVE_MERCY_ON_OUR_SERVERS') except LibcloudError: pass else: - self.fail('Should have thrown an exception with bad algorithm value') + self.fail( + 'Should have thrown an exception with bad algorithm value') def test_ex_update_balancer_no_poll_protocol(self): balancer = LoadBalancer(id='3130', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) action_succeeded = self.driver.ex_update_balancer_no_poll( - balancer, - protocol='HTTPS') + balancer, + protocol='HTTPS') self.assertTrue(action_succeeded) def test_ex_update_balancer_no_poll_port(self): balancer = LoadBalancer(id='3131', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) action_succeeded = self.driver.ex_update_balancer_no_poll( - balancer, - port=1337) + balancer, + port=1337) self.assertTrue(action_succeeded) def test_ex_update_balancer_no_poll_name(self): balancer = LoadBalancer(id='3132', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) action_succeeded = self.driver.ex_update_balancer_no_poll( - balancer, - name='new_lb_name') + balancer, + name='new_lb_name') self.assertTrue(action_succeeded) def test_ex_update_balancer_no_poll_algorithm(self): balancer = LoadBalancer(id='3133', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) action_succeeded = self.driver.ex_update_balancer_no_poll(balancer, - algorithm=Algorithm.ROUND_ROBIN) + algorithm=Algorithm.ROUND_ROBIN) self.assertTrue(action_succeeded) def test_ex_update_balancer_no_poll_bad_algorithm_exception(self): balancer = LoadBalancer(id='3134', name='LB_update', - state='PENDING_UPDATE', ip='10.34.4.3', - port=80, driver=self.driver) + state='PENDING_UPDATE', ip='10.34.4.3', + port=80, driver=self.driver) try: self.driver.update_balancer(balancer, algorithm='HAVE_MERCY_ON_OUR_SERVERS') @@ -870,7 +890,7 @@ class RackspaceLBTests(unittest.TestCase): first_member = members[0] member = self.driver.ex_balancer_update_member(balancer, first_member, - condition=MemberCondition.ENABLED, weight=12) + condition=MemberCondition.ENABLED, weight=12) self.assertEqual(MemberCondition.ENABLED, member.extra['condition']) self.assertEqual(12, member.extra['weight']) @@ -881,22 +901,24 @@ class RackspaceLBTests(unittest.TestCase): first_member = members[0] - resp = self.driver.ex_balancer_update_member_no_poll(balancer, first_member, + resp = self.driver.ex_balancer_update_member_no_poll( + balancer, first_member, condition=MemberCondition.ENABLED, weight=12) self.assertTrue(resp) def test_ex_list_current_usage(self): balancer = self.driver.get_balancer(balancer_id='8290') usage = self.driver.ex_list_current_usage(balancer=balancer) - self.assertEqual(usage['loadBalancerUsageRecords'][0]['incomingTransferSsl'], - 6182163) + self.assertEqual( + usage['loadBalancerUsageRecords'][0]['incomingTransferSsl'], + 6182163) class RackspaceUKLBTests(RackspaceLBTests): def setUp(self): RackspaceLBDriver.connectionCls.conn_classes = (None, - RackspaceLBMockHttp) + RackspaceLBMockHttp) RackspaceLBMockHttp.type = None self.driver = RackspaceUKLBDriver('user', 'key') # normally authentication happens lazily, but we force it here @@ -953,7 +975,7 @@ class RackspaceLBMockHttp(MockHttpTestCase): for balancer in balancers_json['loadBalancers']: id = balancer['id'] self.assertTrue(urlencode([('id', id)]) in url, - msg='Did not delete balancer with id %d' % id) + msg='Did not delete balancer with id %d' % id) return (httplib.ACCEPTED, '', {}, httplib.responses[httplib.ACCEPTED]) @@ -985,7 +1007,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): json_node = json_body['nodes'][0] self.assertEqual('DISABLED', json_node['condition']) self.assertEqual(10, json_node['weight']) - response_body = self.fixtures.load('v1_slug_loadbalancers_8290_nodes_post.json') + response_body = self.fixtures.load( + 'v1_slug_loadbalancers_8290_nodes_post.json') return (httplib.ACCEPTED, response_body, {}, httplib.responses[httplib.ACCEPTED]) elif method == "DELETE": @@ -995,7 +1018,7 @@ class RackspaceLBMockHttp(MockHttpTestCase): for node in json_nodes['nodes']: id = node['id'] self.assertTrue(urlencode([('id', id)]) in url, - msg='Did not delete member with id %d' % id) + msg='Did not delete member with id %d' % id) return (httplib.ACCEPTED, '', {}, httplib.responses[httplib.ACCEPTED]) @@ -1013,7 +1036,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): json_body = json.loads(body) json_node = json_body['nodes'][0] self.assertEqual('ENABLED', json_node['condition']) - response_body = self.fixtures.load('v1_slug_loadbalancers_8290_nodes_post.json') + response_body = self.fixtures.load( + 'v1_slug_loadbalancers_8290_nodes_post.json') return (httplib.ACCEPTED, response_body, {}, httplib.responses[httplib.ACCEPTED]) @@ -1033,7 +1057,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): json_node_2 = json_body['nodes'][1] self.assertEqual('10.1.0.12', json_node_1['address']) self.assertEqual('10.1.0.13', json_node_2['address']) - response_body = self.fixtures.load('v1_slug_loadbalancers_8292_nodes_post.json') + response_body = self.fixtures.load( + 'v1_slug_loadbalancers_8292_nodes_post.json') return (httplib.ACCEPTED, response_body, {}, httplib.responses[httplib.ACCEPTED]) @@ -1080,76 +1105,86 @@ class RackspaceLBMockHttp(MockHttpTestCase): def _v1_0_11111_loadbalancers_8290_errorpage(self, method, url, body, headers): if method == 'GET': - body = self.fixtures.load('v1_slug_loadbalancers_8290_errorpage.json') + body = self.fixtures.load( + 'v1_slug_loadbalancers_8290_errorpage.json') return (httplib.OK, body, {}, httplib.responses[httplib.OK]) elif method == 'PUT': json_body = json.loads(body) self.assertEqual('Generic Error Page', - json_body['errorpage']['content']) + json_body['errorpage']['content']) return (httplib.ACCEPTED, '', {}, httplib.responses[httplib.ACCEPTED]) raise NotImplementedError def _v1_0_11111_loadbalancers_18940(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_18940_ex_public_ips.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_18940_ex_public_ips.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_18945(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_18945_ex_public_ips.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_18945_ex_public_ips.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_18940_errorpage(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_18940_errorpage.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_18940_errorpage.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_18940_accesslist(self, method, url, body, headers): if method == 'GET': - body = self.fixtures.load('v1_slug_loadbalancers_18940_accesslist.json') + body = self.fixtures.load( + 'v1_slug_loadbalancers_18940_accesslist.json') return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_18941(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_18941_ex_private_ips.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_18941_ex_private_ips.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_94692(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94692_weighted_round_robin.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94692_weighted_round_robin.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_94693(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94693_weighted_least_connections.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94693_weighted_least_connections.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_94694(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94694_unknown_algorithm.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94694_unknown_algorithm.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_94695(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94695_full_details.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94695_full_details.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError @@ -1194,7 +1229,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): if method == 'PUT': json_body = json.loads(body) - persistence_type = json_body['sessionPersistence']['persistenceType'] + persistence_type = json_body[ + 'sessionPersistence']['persistenceType'] self.assertEqual('HTTP_COOKIE', persistence_type) return (httplib.ACCEPTED, '', {}, httplib.responses[httplib.ACCEPTED]) @@ -1212,7 +1248,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): def _v1_0_11111_loadbalancers_94696(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94696_http_health_monitor.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94696_http_health_monitor.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError @@ -1235,21 +1272,24 @@ class RackspaceLBMockHttp(MockHttpTestCase): def _v1_0_11111_loadbalancers_94697(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94697_https_health_monitor.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94697_https_health_monitor.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_94698(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94698_with_access_list.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94698_with_access_list.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_94698_accesslist(self, method, url, body, headers): if method == 'GET': - body = self.fixtures.load('v1_slug_loadbalancers_94698_accesslist.json') + body = self.fixtures.load( + 'v1_slug_loadbalancers_94698_accesslist.json') return (httplib.OK, body, {}, httplib.responses[httplib.OK]) elif method == 'POST': json_body = json.loads(body) @@ -1264,7 +1304,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): def _v1_0_11111_loadbalancers_94699(self, method, url, body, headers): if method == 'GET': # Use the same fixture for batch deletes as for single deletes - body = self.fixtures.load('v1_slug_loadbalancers_94698_with_access_list.json') + body = self.fixtures.load( + 'v1_slug_loadbalancers_94698_with_access_list.json') json_body = json.loads(body) json_body['loadBalancer']['id'] = 94699 @@ -1282,7 +1323,7 @@ class RackspaceLBMockHttp(MockHttpTestCase): for access_rule in access_list_json: id = access_rule['id'] self.assertTrue(urlencode([('id', id)]) in url, - msg='Did not delete access rule with id %d' % id) + msg='Did not delete access rule with id %d' % id) return (httplib.ACCEPTED, '', {}, httplib.responses[httplib.ACCEPTED]) elif method == 'POST': @@ -1306,7 +1347,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): def _v1_0_11111_loadbalancers_94700(self, method, url, body, headers): if method == "GET": - body = self.fixtures.load("v1_slug_loadbalancers_94700_http_health_monitor_no_body_regex.json") + body = self.fixtures.load( + "v1_slug_loadbalancers_94700_http_health_monitor_no_body_regex.json") return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError @@ -1334,7 +1376,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): self.assertDictEqual(json_body, {'protocol': 'HTTPS'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": - response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) + response_body = json.loads( + self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) response_body['loadBalancer']['id'] = 3130 response_body['loadBalancer']['protocol'] = 'HTTPS' return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) @@ -1347,7 +1390,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): self.assertDictEqual(json_body, {'port': 1337}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": - response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) + response_body = json.loads( + self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) response_body['loadBalancer']['id'] = 3131 response_body['loadBalancer']['port'] = 1337 return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) @@ -1360,7 +1404,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): self.assertDictEqual(json_body, {'name': 'new_lb_name'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": - response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) + response_body = json.loads( + self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) response_body['loadBalancer']['id'] = 3132 response_body['loadBalancer']['name'] = 'new_lb_name' return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) @@ -1373,7 +1418,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): self.assertDictEqual(json_body, {'algorithm': 'ROUND_ROBIN'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": - response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) + response_body = json.loads( + self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) response_body['loadBalancer']['id'] = 3133 response_body['loadBalancer']['algorithm'] = 'ROUND_ROBIN' return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) @@ -1392,7 +1438,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): self.assertDictEqual(json_body, {'protocol': 'IMAPv2'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": - response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) + response_body = json.loads( + self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) response_body['loadBalancer']['id'] = 3135 response_body['loadBalancer']['protocol'] = 'IMAPv2' return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) @@ -1405,7 +1452,8 @@ class RackspaceLBMockHttp(MockHttpTestCase): self.assertDictEqual(json_body, {'protocol': 'IMAPv3'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": - response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) + response_body = json.loads( + self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) response_body['loadBalancer']['id'] = 3136 response_body['loadBalancer']['protocol'] = 'IMAPv3' return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) @@ -1418,16 +1466,18 @@ class RackspaceLBMockHttp(MockHttpTestCase): self.assertDictEqual(json_body, {'protocol': 'IMAPv4'}) return (httplib.ACCEPTED, "", {}, httplib.responses[httplib.ACCEPTED]) elif method == "GET": - response_body = json.loads(self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) + response_body = json.loads( + self.fixtures.load("v1_slug_loadbalancers_3xxx.json")) response_body['loadBalancer']['id'] = 3137 response_body['loadBalancer']['protocol'] = 'IMAPv4' return (httplib.OK, json.dumps(response_body), {}, httplib.responses[httplib.OK]) raise NotImplementedError def _v1_0_11111_loadbalancers_8290_usage_current(self, method, url, body, - headers): + headers): if method == 'GET': - body = self.fixtures.load('v1_0_slug_loadbalancers_8290_usage_current.json') + body = self.fixtures.load( + 'v1_0_slug_loadbalancers_8290_usage_current.json') return (httplib.OK, body, {}, httplib.responses[httplib.OK]) raise NotImplementedError http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/storage/test_atmos.py ---------------------------------------------------------------------- diff --git a/libcloud/test/storage/test_atmos.py b/libcloud/test/storage/test_atmos.py index 4da0092..d19a5f8 100644 --- a/libcloud/test/storage/test_atmos.py +++ b/libcloud/test/storage/test_atmos.py @@ -27,9 +27,9 @@ import libcloud.utils.files from libcloud.common.types import LibcloudError from libcloud.storage.base import Container, Object from libcloud.storage.types import ContainerAlreadyExistsError, \ - ContainerDoesNotExistError, \ - ContainerIsNotEmptyError, \ - ObjectDoesNotExistError + ContainerDoesNotExistError, \ + ContainerIsNotEmptyError, \ + ObjectDoesNotExistError from libcloud.storage.drivers.atmos import AtmosConnection, AtmosDriver from libcloud.storage.drivers.dummy import DummyIterator @@ -38,6 +38,7 @@ from libcloud.test.file_fixtures import StorageFileFixtures class AtmosTests(unittest.TestCase): + def setUp(self): AtmosDriver.connectionCls.conn_classes = (None, AtmosMockHttp) AtmosDriver.connectionCls.rawResponseCls = AtmosMockRawResponse @@ -92,7 +93,8 @@ class AtmosTests(unittest.TestCase): 'b21cb59a2ba339d1afdd4810010b0a5aba2ab6b9') def test_get_container_escaped(self): - container = self.driver.get_container(container_name='test & container') + container = self.driver.get_container( + container_name='test & container') self.assertEqual(container.name, 'test & container') self.assertEqual(container.extra['object_id'], 'b21cb59a2ba339d1afdd4810010b0a5aba2ab6b9') @@ -272,7 +274,8 @@ class AtmosTests(unittest.TestCase): container=container, meta_data=None, driver=self.driver) - stream = self.driver.download_object_as_stream(obj=obj, chunk_size=None) + stream = self.driver.download_object_as_stream( + obj=obj, chunk_size=None) self.assertTrue(hasattr(stream, '__iter__')) def test_download_object_as_stream_escaped(self): @@ -282,12 +285,13 @@ class AtmosTests(unittest.TestCase): container=container, meta_data=None, driver=self.driver) - stream = self.driver.download_object_as_stream(obj=obj, chunk_size=None) + stream = self.driver.download_object_as_stream( + obj=obj, chunk_size=None) self.assertTrue(hasattr(stream, '__iter__')) def test_upload_object_success(self): def upload_file(self, response, file_path, chunked=False, - calculate_hash=True): + calculate_hash=True): return True, 'hash343hhash89h932439jsaa89', 1000 old_func = AtmosDriver._upload_file @@ -347,7 +351,8 @@ class AtmosTests(unittest.TestCase): except LibcloudError: pass else: - self.fail('Timeout while uploading but an exception was not thrown') + self.fail( + 'Timeout while uploading but an exception was not thrown') finally: libcloud.utils.files.guess_file_mime_type = old_func1 AtmosMockHttp.send = old_func2 @@ -450,7 +455,7 @@ class AtmosTests(unittest.TestCase): 'zuHDEAgKM1winGnWn3WBsqnz4ks='), ('POST', '/rest/namespace/foo?metadata/user', '', { 'x-emc-meta': 'fakemeta=fake, othermeta=faketoo' - }, '7sLx1nxPIRAtocfv02jz9h1BjbU='), + }, '7sLx1nxPIRAtocfv02jz9h1BjbU='), ] class FakeDriver(object): @@ -512,15 +517,17 @@ class AtmosMockHttp(StorageMockHttp, unittest.TestCase): body = self.fixtures.load('list_containers.xml') return (httplib.OK, body, {}, httplib.responses[httplib.OK]) - def _rest_namespace_test_container__metadata_system(self, method, url, body, - headers): + def _rest_namespace_test_container__metadata_system( + self, method, url, body, + headers): headers = { 'x-emc-meta': 'objectid=b21cb59a2ba339d1afdd4810010b0a5aba2ab6b9' } return (httplib.OK, '', headers, httplib.responses[httplib.OK]) - def _rest_namespace_test_20_26_20container__metadata_system(self, method, url, body, - headers): + def _rest_namespace_test_20_26_20container__metadata_system( + self, method, url, body, + headers): headers = { 'x-emc-meta': 'objectid=b21cb59a2ba339d1afdd4810010b0a5aba2ab6b9' } @@ -564,9 +571,10 @@ class AtmosMockHttp(StorageMockHttp, unittest.TestCase): return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.BAD_REQUEST]) - def _rest_namespace_test_container_test_object_metadata_system(self, method, - url, body, - headers): + def _rest_namespace_test_container_test_object_metadata_system( + self, method, + url, body, + headers): meta = { 'objectid': '322dce3763aadc41acc55ef47867b8d74e45c31d6643', 'size': '555', @@ -577,9 +585,10 @@ class AtmosMockHttp(StorageMockHttp, unittest.TestCase): } return (httplib.OK, '', headers, httplib.responses[httplib.OK]) - def _rest_namespace_test_20_26_20container_test_20_26_20object_metadata_system(self, method, - url, body, - headers): + def _rest_namespace_test_20_26_20container_test_20_26_20object_metadata_system( + self, method, + url, body, + headers): meta = { 'objectid': '322dce3763aadc41acc55ef47867b8d74e45c31d6643', 'size': '555', @@ -603,9 +612,10 @@ class AtmosMockHttp(StorageMockHttp, unittest.TestCase): } return (httplib.OK, '', headers, httplib.responses[httplib.OK]) - def _rest_namespace_test_20_26_20container_test_20_26_20object_metadata_user(self, method, - url, body, - headers): + def _rest_namespace_test_20_26_20container_test_20_26_20object_metadata_user( + self, method, + url, body, + headers): meta = { 'md5': '6b21c4a111ac178feacf9ec9d0c71f17', 'foo-bar': 'test 1', @@ -627,13 +637,15 @@ class AtmosMockHttp(StorageMockHttp, unittest.TestCase): body, headers): return (httplib.OK, '', {}, httplib.responses[httplib.OK]) - def _rest_namespace_foo_20_26_20bar_container_foo_20_26_20bar_object(self, method, url, - body, headers): + def _rest_namespace_foo_20_26_20bar_container_foo_20_26_20bar_object( + self, method, url, + body, headers): return (httplib.OK, '', {}, httplib.responses[httplib.OK]) - def _rest_namespace_foo_bar_container_foo_bar_object_NOT_FOUND(self, method, - url, body, - headers): + def _rest_namespace_foo_bar_container_foo_bar_object_NOT_FOUND( + self, method, + url, body, + headers): body = self.fixtures.load('not_found.xml') return (httplib.NOT_FOUND, body, {}, httplib.responses[httplib.NOT_FOUND]) @@ -742,14 +754,16 @@ class AtmosMockRawResponse(MockRawResponse): body = self._generate_random_data(1000) return (httplib.OK, body, {}, httplib.responses[httplib.OK]) - def _rest_namespace_foo_20_26_20bar_container_foo_20_26_20bar_object(self, method, url, - body, headers): + def _rest_namespace_foo_20_26_20bar_container_foo_20_26_20bar_object( + self, method, url, + body, headers): body = self._generate_random_data(1000) return (httplib.OK, body, {}, httplib.responses[httplib.OK]) - def _rest_namespace_foo_bar_container_foo_bar_object_NOT_FOUND(self, method, - url, body, - headers): + def _rest_namespace_foo_bar_container_foo_bar_object_NOT_FOUND( + self, method, + url, body, + headers): body = self.fixtures.load('not_found.xml') return (httplib.NOT_FOUND, body, {}, httplib.responses[httplib.NOT_FOUND]) http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/storage/test_azure_blobs.py ---------------------------------------------------------------------- diff --git a/libcloud/test/storage/test_azure_blobs.py b/libcloud/test/storage/test_azure_blobs.py index 78f1f80..87f1238 100644 --- a/libcloud/test/storage/test_azure_blobs.py +++ b/libcloud/test/storage/test_azure_blobs.py @@ -20,7 +20,6 @@ import sys import unittest import tempfile -from xml.etree import ElementTree as ET from libcloud.utils.py3 import httplib from libcloud.utils.py3 import urlparse from libcloud.utils.py3 import parse_qs @@ -39,9 +38,9 @@ from libcloud.storage.drivers.azure_blobs import AZURE_BLOCK_MAX_SIZE from libcloud.storage.drivers.azure_blobs import AZURE_PAGE_CHUNK_SIZE from libcloud.storage.drivers.dummy import DummyIterator -from libcloud.test import StorageMockHttp, MockRawResponse # pylint: disable-msg=E0611 -from libcloud.test import MockHttpTestCase # pylint: disable-msg=E0611 -from libcloud.test.file_fixtures import StorageFileFixtures # pylint: disable-msg=E0611 +from libcloud.test import StorageMockHttp, MockRawResponse # pylint: disable-msg=E0611 +from libcloud.test import MockHttpTestCase # pylint: disable-msg=E0611 +from libcloud.test.file_fixtures import StorageFileFixtures # pylint: disable-msg=E0611 from libcloud.test.secrets import STORAGE_AZURE_BLOBS_PARAMS @@ -177,11 +176,11 @@ class AzureBlobsMockHttp(StorageMockHttp, MockHttpTestCase): # test_get_object body = self.fixtures.load('list_containers.xml') headers = {'content-type': 'application/zip', - 'etag': '"e31208wqsdoj329jd"', - 'x-amz-meta-rabbits': 'monkeys', - 'content-length': 12345, - 'last-modified': 'Thu, 13 Sep 2012 07:13:22 GMT' - } + 'etag': '"e31208wqsdoj329jd"', + 'x-amz-meta-rabbits': 'monkeys', + 'content-length': 12345, + 'last-modified': 'Thu, 13 Sep 2012 07:13:22 GMT' + } return (httplib.OK, body, @@ -376,9 +375,9 @@ class AzureBlobsTests(unittest.TestCase): def setUp(self): self.driver_type.connectionCls.conn_classes = (None, - self.mock_response_klass) + self.mock_response_klass) self.driver_type.connectionCls.rawResponseCls = \ - self.mock_raw_response_klass + self.mock_raw_response_klass self.mock_response_klass.type = None self.mock_raw_response_klass.type = None self.driver = self.create_driver() @@ -462,7 +461,7 @@ class AzureBlobsTests(unittest.TestCase): def test_get_container_success(self): self.mock_response_klass.type = None container = self.driver.get_container( - container_name='test_container200') + container_name='test_container200') self.assertTrue(container.name, 'test_container200') self.assertTrue(container.extra['etag'], '0x8CFB877BB56A6FB') @@ -675,11 +674,11 @@ class AzureBlobsTests(unittest.TestCase): object_name = 'foo_test_upload' extra = {'meta_data': {'some-value': 'foobar'}} obj = self.driver.upload_object(file_path=file_path, - container=container, - object_name=object_name, - extra=extra, - verify_hash=False, - ex_blob_type='BlockBlob') + container=container, + object_name=object_name, + extra=extra, + verify_hash=False, + ex_blob_type='BlockBlob') self.assertEqual(obj.name, 'foo_test_upload') self.assertEqual(obj.size, file_size) @@ -697,11 +696,11 @@ class AzureBlobsTests(unittest.TestCase): object_name = 'foo_test_upload' extra = {'meta_data': {'some-value': 'foobar'}} obj = self.driver.upload_object(file_path=file_path, - container=container, - object_name=object_name, - extra=extra, - verify_hash=False, - ex_blob_type='BlockBlob') + container=container, + object_name=object_name, + extra=extra, + verify_hash=False, + ex_blob_type='BlockBlob') self.assertEqual(obj.name, 'foo_test_upload') self.assertEqual(obj.size, file_size) @@ -722,11 +721,11 @@ class AzureBlobsTests(unittest.TestCase): object_name = 'foo_test_upload' extra = {'meta_data': {'some-value': 'foobar'}} obj = self.driver.upload_object(file_path=file_path, - container=container, - object_name=object_name, - extra=extra, - verify_hash=False, - ex_blob_type='PageBlob') + container=container, + object_name=object_name, + extra=extra, + verify_hash=False, + ex_blob_type='PageBlob') self.assertEqual(obj.name, 'foo_test_upload') self.assertEqual(obj.size, file_size) @@ -747,12 +746,12 @@ class AzureBlobsTests(unittest.TestCase): extra = {'meta_data': {'some-value': 'foobar'}} try: - obj = self.driver.upload_object(file_path=file_path, - container=container, - object_name=object_name, - extra=extra, - verify_hash=False, - ex_blob_type='PageBlob') + self.driver.upload_object(file_path=file_path, + container=container, + object_name=object_name, + extra=extra, + verify_hash=False, + ex_blob_type='PageBlob') except LibcloudError: e = sys.exc_info()[1] self.assertTrue(str(e).lower().find('not aligned') != -1) @@ -769,12 +768,12 @@ class AzureBlobsTests(unittest.TestCase): object_name = 'foo_test_upload' extra = {'meta_data': {'some-value': 'foobar'}} obj = self.driver.upload_object(file_path=file_path, - container=container, - object_name=object_name, - extra=extra, - verify_hash=False, - ex_blob_type='BlockBlob', - ex_use_lease=True) + container=container, + object_name=object_name, + extra=extra, + verify_hash=False, + ex_blob_type='BlockBlob', + ex_use_lease=True) self.assertEqual(obj.name, 'foo_test_upload') self.assertEqual(obj.size, file_size) @@ -794,12 +793,12 @@ class AzureBlobsTests(unittest.TestCase): object_name = 'foo_test_upload' extra = {'meta_data': {'some-value': 'foobar'}} obj = self.driver.upload_object(file_path=file_path, - container=container, - object_name=object_name, - extra=extra, - verify_hash=False, - ex_blob_type='BlockBlob', - ex_use_lease=False) + container=container, + object_name=object_name, + extra=extra, + verify_hash=False, + ex_blob_type='BlockBlob', + ex_use_lease=False) self.assertEqual(obj.name, 'foo_test_upload') self.assertEqual(obj.size, file_size) @@ -821,12 +820,12 @@ class AzureBlobsTests(unittest.TestCase): object_name = 'foo_test_upload' extra = {'meta_data': {'some-value': 'foobar'}} obj = self.driver.upload_object(file_path=file_path, - container=container, - object_name=object_name, - extra=extra, - verify_hash=False, - ex_blob_type='PageBlob', - ex_use_lease=True) + container=container, + object_name=object_name, + extra=extra, + verify_hash=False, + ex_blob_type='PageBlob', + ex_use_lease=True) self.assertEqual(obj.name, 'foo_test_upload') self.assertEqual(obj.size, file_size) http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/storage/test_base.py ---------------------------------------------------------------------- diff --git a/libcloud/test/storage/test_base.py b/libcloud/test/storage/test_base.py index 0905286..05dfea7 100644 --- a/libcloud/test/storage/test_base.py +++ b/libcloud/test/storage/test_base.py @@ -28,10 +28,11 @@ if PY3: from libcloud.storage.base import StorageDriver -from libcloud.test import StorageMockHttp # pylint: disable-msg=E0611 +from libcloud.test import StorageMockHttp # pylint: disable-msg=E0611 class BaseStorageTests(unittest.TestCase): + def setUp(self): self.send_called = 0 StorageDriver.connectionCls.conn_classes = (None, StorageMockHttp) @@ -43,10 +44,12 @@ class BaseStorageTests(unittest.TestCase): def test__upload_object_iterator_must_have_next_method(self): class Iterator(object): + def next(self): pass class Iterator2(file): + def __init__(self): pass @@ -60,8 +63,8 @@ class BaseStorageTests(unittest.TestCase): return True, 'barfoo', 100 kwargs = {'object_name': 'foo', 'content_type': 'foo/bar', - 'upload_func': upload_func, 'upload_func_kwargs': {}, - 'request_path': '/', 'headers': {}} + 'upload_func': upload_func, 'upload_func_kwargs': {}, + 'request_path': '/', 'headers': {}} for value in valid_iterators: kwargs['iterator'] = value @@ -94,9 +97,9 @@ class BaseStorageTests(unittest.TestCase): # Normal success, data_hash, bytes_transferred = \ - self.driver1._stream_data(response=response, - iterator=iterator, - chunked=False, calculate_hash=True) + self.driver1._stream_data(response=response, + iterator=iterator, + chunked=False, calculate_hash=True) self.assertTrue(success) self.assertEqual(data_hash, hashlib.md5(b('')).hexdigest()) @@ -105,9 +108,9 @@ class BaseStorageTests(unittest.TestCase): # Chunked success, data_hash, bytes_transferred = \ - self.driver1._stream_data(response=response, - iterator=iterator, - chunked=True, calculate_hash=True) + self.driver1._stream_data(response=response, + iterator=iterator, + chunked=True, calculate_hash=True) self.assertTrue(success) self.assertEqual(data_hash, hashlib.md5(b('')).hexdigest()) @@ -123,8 +126,8 @@ class BaseStorageTests(unittest.TestCase): data = '123456789901234567' success, data_hash, bytes_transferred = \ - self.driver1._upload_data(response=response, data=data, - calculate_hash=True) + self.driver1._upload_data(response=response, data=data, + calculate_hash=True) self.assertTrue(success) self.assertEqual(data_hash, hashlib.md5(b(data)).hexdigest())