diff --git a/nailgun/test/base.py b/nailgun/test/base.py index d9ffd460c..e490d2c9f 100644 --- a/nailgun/test/base.py +++ b/nailgun/test/base.py @@ -9,8 +9,8 @@ from api.urls import urls from db import dropdb, syncdb, flush from manage import app -class BaseHandlers(TestCase): +class BaseHandlers(TestCase): @classmethod def setUpClass(cls): dropdb() @@ -74,6 +74,7 @@ class BaseHandlers(TestCase): self.db.commit() return cluster + def reverse(name, kwargs=None): urldict = dict(zip(urls[1::2], urls[::2])) url = urldict[name] diff --git a/nailgun/test/test_cluster_collection_handlers.py b/nailgun/test/test_cluster_collection_handlers.py index e15cb884e..3bccb5e45 100644 --- a/nailgun/test/test_cluster_collection_handlers.py +++ b/nailgun/test/test_cluster_collection_handlers.py @@ -6,11 +6,10 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_cluster_list_empty(self): resp = self.app.get( reverse('ClusterCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) @@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers): self.create_default_cluster() resp = self.app.get( reverse('ClusterCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) self.assertEquals(100, len(response)) - diff --git a/nailgun/test/test_cluster_handler.py b/nailgun/test/test_cluster_handler.py index af1b77c92..df0db6139 100644 --- a/nailgun/test/test_cluster_handler.py +++ b/nailgun/test/test_cluster_handler.py @@ -7,7 +7,6 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_cluster_put_attach_node(self): pass @@ -21,7 +20,7 @@ class TestHandlers(BaseHandlers): cluster = self.create_default_cluster() resp = self.app.delete( reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(204, resp.status) self.assertEquals('', resp.body) @@ -30,7 +29,7 @@ class TestHandlers(BaseHandlers): cluster = self.create_default_cluster() resp = self.app.get( reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) @@ -43,12 +42,12 @@ class TestHandlers(BaseHandlers): release = self.create_default_release() yet_another_cluster_name = 'Yet another cluster' resp = self.app.post( - '/api/clusters', - params=json.dumps({ - 'name': yet_another_cluster_name, - 'release': release.id - }), - headers = self.default_headers + '/api/clusters', + params=json.dumps({ + 'name': yet_another_cluster_name, + 'release': release.id + }), + headers=self.default_headers ) self.assertEquals(201, resp.status) response = json.loads(resp.body) diff --git a/nailgun/test/test_handlers.py b/nailgun/test/test_handlers.py index 8b2331783..6cabd73bb 100644 --- a/nailgun/test/test_handlers.py +++ b/nailgun/test/test_handlers.py @@ -8,7 +8,6 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_release_creation(self): resp = self.app.post( '/api/releases', @@ -27,17 +26,16 @@ class TestHandlers(BaseHandlers): 'ReleaseHandler': {'release_id': 1}, 'RoleHandler': {'role_id': 1}, } - for handler in urls: test_url = reverse(handler, urls[handler]) 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) - self.assertTrue(resp.status in [404,405]) + self.assertTrue(resp.status in [404, 405]) 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) - self.assertTrue(resp.status in [404,405]) + self.assertTrue(resp.status in [404, 405]) def test_release_create(self): release_name = "OpenStack" diff --git a/nailgun/test/test_node_collection_handlers.py b/nailgun/test/test_node_collection_handlers.py index f89500c73..6768d54f4 100644 --- a/nailgun/test/test_node_collection_handlers.py +++ b/nailgun/test/test_node_collection_handlers.py @@ -6,11 +6,10 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_node_list_empty(self): resp = self.app.get( reverse('NodeCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) @@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers): self.create_default_node() resp = self.app.get( reverse('NodeCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) self.assertEquals(100, len(response)) - diff --git a/nailgun/test/test_node_handler.py b/nailgun/test/test_node_handler.py index ad6b0d3a3..75f5a4b8a 100644 --- a/nailgun/test/test_node_handler.py +++ b/nailgun/test/test_node_handler.py @@ -8,7 +8,6 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_node_creation_with_id(self): node_id = '080000000003' resp = self.app.post( @@ -26,7 +25,7 @@ class TestHandlers(BaseHandlers): self.assertEquals(resp.status, 201) node = self.db.query(Node).filter(Node.mac == 'ASDFAAASDFAA').one() response = json.loads(resp.body) - self.assertEquals('ready',response['status']) + self.assertEquals('ready', response['status']) def test_node_deletion(self): node = self.create_default_node() @@ -201,7 +200,3 @@ class TestHandlers(BaseHandlers): node_from_db = Node.objects.get(id=self.create_default_node().id) self.assertEquals(node_from_db.metadata, old_meta) - - - - diff --git a/nailgun/test/test_release_collection_handlers.py b/nailgun/test/test_release_collection_handlers.py index c335f25dc..e0d0bdbb1 100644 --- a/nailgun/test/test_release_collection_handlers.py +++ b/nailgun/test/test_release_collection_handlers.py @@ -6,11 +6,10 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_release_list_empty(self): resp = self.app.get( reverse('ReleaseCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) @@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers): self.create_default_release() resp = self.app.get( reverse('ReleaseCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) self.assertEquals(100, len(response)) - diff --git a/nailgun/test/test_release_handler.py b/nailgun/test/test_release_handler.py index c309582ba..d2c4fceab 100644 --- a/nailgun/test/test_release_handler.py +++ b/nailgun/test/test_release_handler.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import unittest import json from paste.fixture import TestApp from api.models import Release @@ -8,12 +7,10 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_release_put_change_name_and_version(self): release = self.create_default_release() resp = self.app.put( - reverse('ReleaseHandler', - kwargs={'release_id': release.id}), + reverse('ReleaseHandler', kwargs={'release_id': release.id}), params=json.dumps({ 'name': 'modified release', 'version': '5.1' @@ -101,4 +98,3 @@ class TestHandlers(BaseHandlers): Release.version == release_version, Release.description == release_description ).one() - diff --git a/nailgun/test/test_role_collection_handlers.py b/nailgun/test/test_role_collection_handlers.py index a37306f76..e4dd072b4 100644 --- a/nailgun/test/test_role_collection_handlers.py +++ b/nailgun/test/test_role_collection_handlers.py @@ -6,11 +6,10 @@ from base import reverse class TestHandlers(BaseHandlers): - def test_role_list_empty(self): resp = self.app.get( reverse('RoleCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) @@ -21,9 +20,8 @@ class TestHandlers(BaseHandlers): self.create_default_role() resp = self.app.get( reverse('RoleCollectionHandler'), - headers = self.default_headers + headers=self.default_headers ) self.assertEquals(200, resp.status) response = json.loads(resp.body) self.assertEquals(100, len(response)) -