openstack/fuel-main
Code Issues Proposed changes

Meet pep8

Browse Source
This commit is contained in:
vic 2012-09-05 16:52:04 +04:00 committed by BeachHead Jenkins CI
parent ef804884a8
commit dd24231972
9 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nailgun/test/base.py
View File

@ -9,8 +9,8 @@ from api.urls import urls
from db import dropdb, syncdb, flush from db import dropdb, syncdb, flush
from manage import app from manage import app
class BaseHandlers(TestCase):
class BaseHandlers(TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
dropdb() dropdb()
@ -74,6 +74,7 @@ class BaseHandlers(TestCase):
self.db.commit() self.db.commit()
return cluster return cluster
def reverse(name, kwargs=None): def reverse(name, kwargs=None):
urldict = dict(zip(urls[1::2], urls[::2])) urldict = dict(zip(urls[1::2], urls[::2]))
url = urldict[name] url = urldict[name]

6
nailgun/test/test_cluster_collection_handlers.py
View File

@ -6,11 +6,10 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_cluster_list_empty(self): def test_cluster_list_empty(self):
resp = self.app.get( resp = self.app.get(
reverse('ClusterCollectionHandler'), reverse('ClusterCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers):
self.create_default_cluster() self.create_default_cluster()
resp = self.app.get( resp = self.app.get(
reverse('ClusterCollectionHandler'), reverse('ClusterCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
self.assertEquals(100, len(response)) self.assertEquals(100, len(response))

17
nailgun/test/test_cluster_handler.py
View File

@ -7,7 +7,6 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_cluster_put_attach_node(self): def test_cluster_put_attach_node(self):
pass pass
@ -21,7 +20,7 @@ class TestHandlers(BaseHandlers):
cluster = self.create_default_cluster() cluster = self.create_default_cluster()
resp = self.app.delete( resp = self.app.delete(
reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(204, resp.status) self.assertEquals(204, resp.status)
self.assertEquals('', resp.body) self.assertEquals('', resp.body)
@ -30,7 +29,7 @@ class TestHandlers(BaseHandlers):
cluster = self.create_default_cluster() cluster = self.create_default_cluster()
resp = self.app.get( resp = self.app.get(
reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
@ -43,12 +42,12 @@ class TestHandlers(BaseHandlers):
release = self.create_default_release() release = self.create_default_release()
yet_another_cluster_name = 'Yet another cluster' yet_another_cluster_name = 'Yet another cluster'
resp = self.app.post( resp = self.app.post(
'/api/clusters', '/api/clusters',
params=json.dumps({ params=json.dumps({
'name': yet_another_cluster_name, 'name': yet_another_cluster_name,
'release': release.id 'release': release.id
}), }),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(201, resp.status) self.assertEquals(201, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)

10
nailgun/test/test_handlers.py
View File

@ -8,7 +8,6 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_release_creation(self): def test_release_creation(self):
resp = self.app.post( resp = self.app.post(
'/api/releases', '/api/releases',
@ -27,17 +26,16 @@ class TestHandlers(BaseHandlers):
'ReleaseHandler': {'release_id': 1}, 'ReleaseHandler': {'release_id': 1},
'RoleHandler': {'role_id': 1}, 'RoleHandler': {'role_id': 1},
} }
for handler in urls: for handler in urls:
test_url = reverse(handler, urls[handler]) test_url = reverse(handler, urls[handler])
resp = self.app.get(test_url, expect_errors=True) resp = self.app.get(test_url, expect_errors=True)
self.assertTrue(resp.status in [404,405]) self.assertTrue(resp.status in [404, 405])
resp = self.app.delete(test_url, expect_errors=True) resp = self.app.delete(test_url, expect_errors=True)
self.assertTrue(resp.status in [404,405]) self.assertTrue(resp.status in [404, 405])
resp = self.app.put(test_url, expect_errors=True) resp = self.app.put(test_url, expect_errors=True)
self.assertTrue(resp.status in [404,405]) self.assertTrue(resp.status in [404, 405])
resp = self.app.post(test_url, expect_errors=True) resp = self.app.post(test_url, expect_errors=True)
self.assertTrue(resp.status in [404,405]) self.assertTrue(resp.status in [404, 405])
def test_release_create(self): def test_release_create(self):
release_name = "OpenStack" release_name = "OpenStack"

6
nailgun/test/test_node_collection_handlers.py
View File

@ -6,11 +6,10 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_node_list_empty(self): def test_node_list_empty(self):
resp = self.app.get( resp = self.app.get(
reverse('NodeCollectionHandler'), reverse('NodeCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers):
self.create_default_node() self.create_default_node()
resp = self.app.get( resp = self.app.get(
reverse('NodeCollectionHandler'), reverse('NodeCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
self.assertEquals(100, len(response)) self.assertEquals(100, len(response))

7
nailgun/test/test_node_handler.py
View File

@ -8,7 +8,6 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_node_creation_with_id(self): def test_node_creation_with_id(self):
node_id = '080000000003' node_id = '080000000003'
resp = self.app.post( resp = self.app.post(
@ -26,7 +25,7 @@ class TestHandlers(BaseHandlers):
self.assertEquals(resp.status, 201) self.assertEquals(resp.status, 201)
node = self.db.query(Node).filter(Node.mac == 'ASDFAAASDFAA').one() node = self.db.query(Node).filter(Node.mac == 'ASDFAAASDFAA').one()
response = json.loads(resp.body) response = json.loads(resp.body)
self.assertEquals('ready',response['status']) self.assertEquals('ready', response['status'])
def test_node_deletion(self): def test_node_deletion(self):
node = self.create_default_node() node = self.create_default_node()
@ -201,7 +200,3 @@ class TestHandlers(BaseHandlers):
node_from_db = Node.objects.get(id=self.create_default_node().id) node_from_db = Node.objects.get(id=self.create_default_node().id)
self.assertEquals(node_from_db.metadata, old_meta) self.assertEquals(node_from_db.metadata, old_meta)

6
nailgun/test/test_release_collection_handlers.py
View File

@ -6,11 +6,10 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_release_list_empty(self): def test_release_list_empty(self):
resp = self.app.get( resp = self.app.get(
reverse('ReleaseCollectionHandler'), reverse('ReleaseCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers):
self.create_default_release() self.create_default_release()
resp = self.app.get( resp = self.app.get(
reverse('ReleaseCollectionHandler'), reverse('ReleaseCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
self.assertEquals(100, len(response)) self.assertEquals(100, len(response))

6
nailgun/test/test_release_handler.py
View File

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import unittest
import json import json
from paste.fixture import TestApp from paste.fixture import TestApp
from api.models import Release from api.models import Release
@ -8,12 +7,10 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_release_put_change_name_and_version(self): def test_release_put_change_name_and_version(self):
release = self.create_default_release() release = self.create_default_release()
resp = self.app.put( resp = self.app.put(
reverse('ReleaseHandler', reverse('ReleaseHandler', kwargs={'release_id': release.id}),
kwargs={'release_id': release.id}),
params=json.dumps({ params=json.dumps({
'name': 'modified release', 'name': 'modified release',
'version': '5.1' 'version': '5.1'
@ -101,4 +98,3 @@ class TestHandlers(BaseHandlers):
Release.version == release_version, Release.version == release_version,
Release.description == release_description Release.description == release_description
).one() ).one()

6
nailgun/test/test_role_collection_handlers.py
View File

@ -6,11 +6,10 @@ from base import reverse
class TestHandlers(BaseHandlers): class TestHandlers(BaseHandlers):
def test_role_list_empty(self): def test_role_list_empty(self):
resp = self.app.get( resp = self.app.get(
reverse('RoleCollectionHandler'), reverse('RoleCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers):
self.create_default_role() self.create_default_role()
resp = self.app.get( resp = self.app.get(
reverse('RoleCollectionHandler'), reverse('RoleCollectionHandler'),
headers = self.default_headers headers=self.default_headers
) )
self.assertEquals(200, resp.status) self.assertEquals(200, resp.status)
response = json.loads(resp.body) response = json.loads(resp.body)
self.assertEquals(100, len(response)) self.assertEquals(100, len(response))