From a354f016abec257891a53277dc936db3fdf65e6c Mon Sep 17 00:00:00 2001 From: lin-hua-cheng Date: Mon, 3 Aug 2015 20:33:59 -0700 Subject: [PATCH] Use setUp() method for neutron rest test There is no reason to override the setUpClass() in the test case. For data setup, the setUp() should be used. There is also an issue where the code is not calling super() class, this issue is exposed when running the test in django18. Closes-Bug: #1481143 Partially Implements: blueprint django18 Change-Id: Ic64cc0a5f0c7d0476bfac63b6e23fe8a1461d6ef --- .../test/api_tests/neutron_rest_tests.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/openstack_dashboard/test/api_tests/neutron_rest_tests.py b/openstack_dashboard/test/api_tests/neutron_rest_tests.py index 8a064b2e41..279d718ea5 100644 --- a/openstack_dashboard/test/api_tests/neutron_rest_tests.py +++ b/openstack_dashboard/test/api_tests/neutron_rest_tests.py @@ -27,10 +27,10 @@ TEST = TestData(neutron_data.data) class NeutronNetworksTestCase(test.TestCase): - @classmethod - def setUpClass(cls): - cls._networks = [mock_factory(n) - for n in TEST.api_networks.list()] + def setUp(self): + super(NeutronNetworksTestCase, self).setUp() + self._networks = [mock_factory(n) + for n in TEST.api_networks.list()] @mock.patch.object(neutron.api, 'neutron') def test_get_list_for_tenant(self, client): @@ -71,12 +71,12 @@ class NeutronNetworksTestCase(test.TestCase): class NeutronSubnetsTestCase(test.TestCase): - @classmethod - def setUpClass(cls): - cls._networks = [mock_factory(n) - for n in TEST.api_networks.list()] - cls._subnets = [mock_factory(n) - for n in TEST.api_subnets.list()] + def setUp(self): + super(NeutronSubnetsTestCase, self).setUp() + self._networks = [mock_factory(n) + for n in TEST.api_networks.list()] + self._subnets = [mock_factory(n) + for n in TEST.api_subnets.list()] @mock.patch.object(neutron.api, 'neutron') def test_get(self, client): @@ -105,12 +105,12 @@ class NeutronSubnetsTestCase(test.TestCase): class NeutronPortsTestCase(test.TestCase): - @classmethod - def setUpClass(cls): - cls._networks = [mock_factory(n) - for n in TEST.api_networks.list()] - cls._ports = [mock_factory(n) - for n in TEST.api_ports.list()] + def setUp(self): + super(NeutronPortsTestCase, self).setUp() + self._networks = [mock_factory(n) + for n in TEST.api_networks.list()] + self._ports = [mock_factory(n) + for n in TEST.api_ports.list()] @mock.patch.object(neutron.api, 'neutron') def test_get(self, client):