Merge "Remove unneeded context initialization in tests"

14 files changed, 6 insertions, 30 deletions

diff --git a/ironic/tests/api/v1/test_nodes.py b/ironic/tests/api/v1/test_nodes.py
index bb44e939c..ca9882f7b 100644
--- a/ironic/tests/api/v1/test_nodes.py
+++ b/ironic/tests/api/v1/test_nodes.py
@@ -29,7 +29,6 @@ from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import rpcapi
 from ironic import objects
-from ironic.openstack.common import context
 from ironic.tests.api import base
 from ironic.tests.api import utils as apiutils
 from ironic.tests.db import utils as dbutils
@@ -928,7 +927,7 @@ class TestDelete(base.FunctionalTest):
 
     @mock.patch.object(objects.Node, 'get_by_uuid')
     def test_delete_node_not_found(self, mock_gbu):
-        node = obj_utils.get_test_node(context.get_admin_context())
+        node = obj_utils.get_test_node(self.context)
         mock_gbu.side_effect = exception.NodeNotFound(node=node.uuid)
 
         response = self.delete('/nodes/%s' % node.uuid, expect_errors=True)
diff --git a/ironic/tests/api/v1/test_ports.py b/ironic/tests/api/v1/test_ports.py
index a3a0a62c2..3f7bc3ff1 100644
--- a/ironic/tests/api/v1/test_ports.py
+++ b/ironic/tests/api/v1/test_ports.py
@@ -26,7 +26,6 @@ from testtools.matchers import HasLength
 from ironic.common import exception
 from ironic.common import utils
 from ironic.conductor import rpcapi
-from ironic.openstack.common import context
 from ironic.tests.api import base
 from ironic.tests.api import utils as apiutils
 from ironic.tests.db import utils as dbutils
@@ -47,7 +46,7 @@ class TestListPorts(base.FunctionalTest):
 
     def setUp(self):
         super(TestListPorts, self).setUp()
-        self.node = obj_utils.create_test_node(context.get_admin_context())
+        self.node = obj_utils.create_test_node(self.context)
 
     def test_empty(self):
         data = self.get_json('/ports')
@@ -173,7 +172,7 @@ class TestPatch(base.FunctionalTest):
 
     def setUp(self):
         super(TestPatch, self).setUp()
-        self.node = obj_utils.create_test_node(context.get_admin_context())
+        self.node = obj_utils.create_test_node(self.context)
         self.port = obj_utils.create_test_port(self.context)
 
         p = mock.patch.object(rpcapi.ConductorAPI, 'get_topic_for')
@@ -472,7 +471,7 @@ class TestPost(base.FunctionalTest):
 
     def setUp(self):
         super(TestPost, self).setUp()
-        self.node = obj_utils.create_test_node(context.get_admin_context())
+        self.node = obj_utils.create_test_node(self.context)
 
     @mock.patch.object(timeutils, 'utcnow')
     def test_create_port(self, mock_utcnow):
diff --git a/ironic/tests/conductor/test_conductor_utils.py b/ironic/tests/conductor/test_conductor_utils.py
index 5f64ad3f8..72915bd59 100644
--- a/ironic/tests/conductor/test_conductor_utils.py
+++ b/ironic/tests/conductor/test_conductor_utils.py
@@ -20,7 +20,6 @@ from ironic.conductor import task_manager
 from ironic.conductor import utils as conductor_utils
 from ironic.db import api as dbapi
 from ironic import objects
-from ironic.openstack.common import context
 from ironic.tests import base as tests_base
 from ironic.tests.conductor import utils as mgr_utils
 from ironic.tests.db import base
@@ -31,7 +30,6 @@ from ironic.tests.objects import utils as obj_utils
 class NodeSetBootDeviceTestCase(base.DbTestCase):
     def setUp(self):
         super(NodeSetBootDeviceTestCase, self).setUp()
-        self.context = context.get_admin_context()
         self.dbapi = dbapi.get_instance()
 
     def test_node_set_boot_device_non_existent_device(self):
@@ -71,7 +69,6 @@ class NodePowerActionTestCase(base.DbTestCase):
 
     def setUp(self):
         super(NodePowerActionTestCase, self).setUp()
-        self.context = context.get_admin_context()
         self.dbapi = dbapi.get_instance()
         mgr_utils.mock_the_extension_manager()
         self.driver = driver_factory.get_driver("fake")
diff --git a/ironic/tests/conductor/test_manager.py b/ironic/tests/conductor/test_manager.py
index d953c9e43..7ab4b83e9 100644
--- a/ironic/tests/conductor/test_manager.py
+++ b/ironic/tests/conductor/test_manager.py
@@ -2170,7 +2170,6 @@ class ManagerTestProperties(tests_db_base.DbTestCase):
     def setUp(self):
         super(ManagerTestProperties, self).setUp()
         self.service = manager.ConductorManager('test-host', 'test-topic')
-        self.context = context.get_admin_context()
 
     def _check_driver_properties(self, driver, expected):
         mgr_utils.mock_the_extension_manager(driver=driver)
diff --git a/ironic/tests/conductor/test_rpcapi.py b/ironic/tests/conductor/test_rpcapi.py
index 5ec4668cd..2715649d6 100644
--- a/ironic/tests/conductor/test_rpcapi.py
+++ b/ironic/tests/conductor/test_rpcapi.py
@@ -30,7 +30,6 @@ from ironic.conductor import manager as conductor_manager
 from ironic.conductor import rpcapi as conductor_rpcapi
 from ironic.db import api as dbapi
 from ironic import objects
-from ironic.openstack.common import context
 from ironic.tests import base as tests_base
 from ironic.tests.db import base
 from ironic.tests.db import utils as dbutils
@@ -50,7 +49,6 @@ class RPCAPITestCase(base.DbTestCase):
 
     def setUp(self):
         super(RPCAPITestCase, self).setUp()
-        self.context = context.get_admin_context()
         self.dbapi = dbapi.get_instance()
         self.fake_node = dbutils.get_test_node(driver='fake-driver')
         self.fake_node_obj = objects.Node._from_db_object(
@@ -102,7 +100,6 @@ class RPCAPITestCase(base.DbTestCase):
                           'fake-driver')
 
     def _test_rpcapi(self, method, rpc_method, **kwargs):
-        ctxt = context.get_admin_context()
         rpcapi = conductor_rpcapi.ConductorAPI(topic='fake-topic')
 
         expected_retval = 'hello world' if rpc_method == 'call' else None
@@ -136,9 +133,9 @@ class RPCAPITestCase(base.DbTestCase):
 
             with mock.patch.object(rpcapi.client, rpc_method) as mock_method:
                 mock_method.side_effect = _fake_rpc_method
-                retval = getattr(rpcapi, method)(ctxt, **kwargs)
+                retval = getattr(rpcapi, method)(self.context, **kwargs)
                 self.assertEqual(retval, expected_retval)
-                expected_args = [ctxt, method, expected_msg]
+                expected_args = [self.context, method, expected_msg]
                 for arg, expected_arg in zip(self.fake_args, expected_args):
                     self.assertEqual(arg, expected_arg)
 
diff --git a/ironic/tests/drivers/test_agent.py b/ironic/tests/drivers/test_agent.py
index fb315e360..f7b2fc9f5 100644
--- a/ironic/tests/drivers/test_agent.py
+++ b/ironic/tests/drivers/test_agent.py
@@ -23,7 +23,6 @@ from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers.modules import agent
 from ironic import objects
-from ironic.openstack.common import context
 from ironic.tests.conductor import utils as mgr_utils
 from ironic.tests.db import base as db_base
 from ironic.tests.db import utils as db_utils
@@ -63,7 +62,6 @@ class TestAgentDeploy(db_base.DbTestCase):
         super(TestAgentDeploy, self).setUp()
         mgr_utils.mock_the_extension_manager(driver='fake_agent')
         self.driver = agent.AgentDeploy()
-        self.context = context.get_admin_context()
         n = {
             'driver': 'fake_agent',
             'instance_info': INSTANCE_INFO,
@@ -118,7 +116,6 @@ class TestAgentVendor(db_base.DbTestCase):
         super(TestAgentVendor, self).setUp()
         mgr_utils.mock_the_extension_manager(driver="fake_pxe")
         self.passthru = agent.AgentVendorInterface()
-        self.context = context.get_admin_context()
         n = {
               'driver': 'fake_pxe',
               'instance_info': INSTANCE_INFO,
diff --git a/ironic/tests/drivers/test_iboot.py b/ironic/tests/drivers/test_iboot.py
index 63e8e22dd..e7582c9cf 100644
--- a/ironic/tests/drivers/test_iboot.py
+++ b/ironic/tests/drivers/test_iboot.py
@@ -207,7 +207,6 @@ class IBootDriverTestCase(db_base.DbTestCase):
         self.dbapi = dbapi.get_instance()
         mgr_utils.mock_the_extension_manager(driver='fake_iboot')
         self.driver = driver_factory.get_driver('fake_iboot')
-        self.context = context.get_admin_context()
         self.node = obj_utils.create_test_node(
                 self.context,
                 driver='fake_iboot',
diff --git a/ironic/tests/drivers/test_ipminative.py b/ironic/tests/drivers/test_ipminative.py
index 534d5972d..e8541afb4 100644
--- a/ironic/tests/drivers/test_ipminative.py
+++ b/ironic/tests/drivers/test_ipminative.py
@@ -217,7 +217,6 @@ class IPMINativeDriverTestCase(db_base.DbTestCase):
 
     def setUp(self):
         super(IPMINativeDriverTestCase, self).setUp()
-        self.context = context.get_admin_context()
         mgr_utils.mock_the_extension_manager(driver="fake_ipminative")
         self.driver = driver_factory.get_driver("fake_ipminative")
 
diff --git a/ironic/tests/drivers/test_ipmitool.py b/ironic/tests/drivers/test_ipmitool.py
index e12b8fd21..b299197ce 100644
--- a/ironic/tests/drivers/test_ipmitool.py
+++ b/ironic/tests/drivers/test_ipmitool.py
@@ -856,7 +856,6 @@ class IPMIToolDriverTestCase(db_base.DbTestCase):
 
     def setUp(self):
         super(IPMIToolDriverTestCase, self).setUp()
-        self.context = context.get_admin_context()
         self.dbapi = db_api.get_instance()
         mgr_utils.mock_the_extension_manager(driver="fake_ipmitool")
         self.driver = driver_factory.get_driver("fake_ipmitool")
diff --git a/ironic/tests/drivers/test_iscsi_deploy.py b/ironic/tests/drivers/test_iscsi_deploy.py
index 38d236e72..0eda5e95f 100644
--- a/ironic/tests/drivers/test_iscsi_deploy.py
+++ b/ironic/tests/drivers/test_iscsi_deploy.py
@@ -156,7 +156,6 @@ class IscsiDeployPrivateMethodsTestCase(db_base.DbTestCase):
         }
         mgr_utils.mock_the_extension_manager(driver="fake_pxe")
         self.dbapi = dbapi.get_instance()
-        self.context = context.get_admin_context()
         self.node = obj_utils.create_test_node(self.context, **n)
 
     def test__get_image_dir_path(self):
@@ -182,7 +181,6 @@ class IscsiDeployMethodsTestCase(db_base.DbTestCase):
         }
         mgr_utils.mock_the_extension_manager(driver="fake_pxe")
         self.dbapi = dbapi.get_instance()
-        self.context = context.get_admin_context()
         self.node = obj_utils.create_test_node(self.context, **n)
 
     @mock.patch.object(deploy_utils, 'fetch_images')
diff --git a/ironic/tests/drivers/test_pxe.py b/ironic/tests/drivers/test_pxe.py
index f17469386..dccedafe3 100644
--- a/ironic/tests/drivers/test_pxe.py
+++ b/ironic/tests/drivers/test_pxe.py
@@ -111,7 +111,6 @@ class PXEPrivateMethodsTestCase(db_base.DbTestCase):
         }
         mgr_utils.mock_the_extension_manager(driver="fake_pxe")
         self.dbapi = dbapi.get_instance()
-        self.context = context.get_admin_context()
         self.node = obj_utils.create_test_node(self.context, **n)
 
     @mock.patch.object(base_image_service.BaseImageService, '_show')
@@ -297,7 +296,6 @@ class PXEDriverTestCase(db_base.DbTestCase):
 
     def setUp(self):
         super(PXEDriverTestCase, self).setUp()
-        self.context = context.get_admin_context()
         self.context.auth_token = '4562138218392831'
         self.temp_dir = tempfile.mkdtemp()
         self.config(tftp_root=self.temp_dir, group='pxe')
diff --git a/ironic/tests/drivers/test_snmp.py b/ironic/tests/drivers/test_snmp.py
index b378d5964..8c4faab4a 100644
--- a/ironic/tests/drivers/test_snmp.py
+++ b/ironic/tests/drivers/test_snmp.py
@@ -1002,7 +1002,6 @@ class SNMPDriverTestCase(db_base.DbTestCase):
 
     def setUp(self):
         super(SNMPDriverTestCase, self).setUp()
-        self.context = context.get_admin_context()
         self.dbapi = db_api.get_instance()
         mgr_utils.mock_the_extension_manager(driver='fake_snmp')
 
diff --git a/ironic/tests/test_hash_ring.py b/ironic/tests/test_hash_ring.py
index dcb347572..402d21113 100644
--- a/ironic/tests/test_hash_ring.py
+++ b/ironic/tests/test_hash_ring.py
@@ -18,7 +18,6 @@ from oslo.config import cfg
 from ironic.common import exception
 from ironic.common import hash_ring as hash
 from ironic.db import api as dbapi
-from ironic.openstack.common import context
 from ironic.tests import base
 from ironic.tests.db import base as db_base
 
@@ -127,7 +126,6 @@ class HashRingManagerTestCase(db_base.DbTestCase):
     def setUp(self):
         super(HashRingManagerTestCase, self).setUp()
         self.ring_manager = hash.HashRingManager()
-        self.context = context.get_admin_context()
         self.dbapi = dbapi.get_instance()
 
     def register_conductors(self):
diff --git a/ironic/tests/test_pxe_utils.py b/ironic/tests/test_pxe_utils.py
index df96dbea4..4cbf280b5 100644
--- a/ironic/tests/test_pxe_utils.py
+++ b/ironic/tests/test_pxe_utils.py
@@ -22,7 +22,6 @@ from oslo.config import cfg
 from ironic.common import pxe_utils
 from ironic.conductor import task_manager
 from ironic.db import api as dbapi
-from ironic.openstack.common import context
 from ironic.tests.conductor import utils as mgr_utils
 from ironic.tests.db import base as db_base
 from ironic.tests.objects import utils as object_utils
@@ -36,7 +35,6 @@ class TestPXEUtils(db_base.DbTestCase):
         super(TestPXEUtils, self).setUp()
         mgr_utils.mock_the_extension_manager(driver="fake")
         self.dbapi = dbapi.get_instance()
-        self.context = context.get_admin_context()
         self.pxe_options = {
             'deployment_key': '0123456789ABCDEFGHIJKLMNOPQRSTUV',
             'ari_path': u'/tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/'