x/python-ganttclient
Code Issues Proposed changes

Beautify it a little bit, thanks to dabo.

Browse Source
This commit is contained in:
Soren Hansen
2011-02-15 13:18:27 +01:00
parent 0a04c879b7
commit fa60c10516
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nova/tests/test_api.py
View File

@@ -248,17 +248,14 @@ class ApiEc2TestCase(test.TestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
rv = self.ec2.get_all_security_groups() rv = self.ec2.get_all_security_groups()
# I don't bother checkng that we actually find it here,
# because the create/delete unit test further up should group = [grp for grp in rv if grp.name == security_group_name][0]
# be good enough for that.
for group in rv: self.assertEquals(len(group.rules), 1)
if group.name == security_group_name: self.assertEquals(int(group.rules[0].from_port), 80)
self.assertEquals(len(group.rules), 1) self.assertEquals(int(group.rules[0].to_port), 81)
self.assertEquals(int(group.rules[0].from_port), 80) self.assertEquals(len(group.rules[0].grants), 1)
self.assertEquals(int(group.rules[0].to_port), 81) self.assertEquals(str(group.rules[0].grants[0]), '0.0.0.0/0')
self.assertEquals(len(group.rules[0].grants), 1)
self.assertEquals(str(group.rules[0].grants[0]), '0.0.0.0/0')
break
self.expect_http() self.expect_http()
self.mox.ReplayAll() self.mox.ReplayAll()
@@ -315,17 +312,13 @@ class ApiEc2TestCase(test.TestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
rv = self.ec2.get_all_security_groups() rv = self.ec2.get_all_security_groups()
# I don't bother checkng that we actually find it here,
# because the create/delete unit test further up should group = [grp for grp in rv if grp.name == security_group_name][0]
# be good enough for that. self.assertEquals(len(group.rules), 1)
for group in rv: self.assertEquals(int(group.rules[0].from_port), 80)
if group.name == security_group_name: self.assertEquals(int(group.rules[0].to_port), 81)
self.assertEquals(len(group.rules), 1) self.assertEquals(len(group.rules[0].grants), 1)
self.assertEquals(int(group.rules[0].from_port), 80) self.assertEquals(str(group.rules[0].grants[0]), '::/0')
self.assertEquals(int(group.rules[0].to_port), 81)
self.assertEquals(len(group.rules[0].grants), 1)
self.assertEquals(str(group.rules[0].grants[0]), '::/0')
break
self.expect_http() self.expect_http()
self.mox.ReplayAll() self.mox.ReplayAll()