From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 16 Jul 2015 09:34:28 +0000 (+0000)
Subject: Merge "Small fixes in test_qos_agent UT" into feature/qos
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a28769ff7e4824568cf1817f5ab0d3807b41d131;p=openstack-build%2Fneutron-build.git

Merge "Small fixes in test_qos_agent UT" into feature/qos
---

a28769ff7e4824568cf1817f5ab0d3807b41d131
diff --cc neutron/tests/unit/agent/l2/extensions/test_qos_agent.py
index a90d5ff9f,2f8ceb190..49c18d8ce
--- a/neutron/tests/unit/agent/l2/extensions/test_qos_agent.py
+++ b/neutron/tests/unit/agent/l2/extensions/test_qos_agent.py
@@@ -32,12 -31,16 +31,12 @@@ class QosAgentExtensionTestCase(base.Ba
      def setUp(self):
          super(QosAgentExtensionTestCase, self).setUp()
          self.qos_agent = qos_agent.QosAgentExtension()
-         self.context = mock.Mock()
+         self.context = context.get_admin_context()
  
 -        # Force our fake underlying QoS driver
 -        #TODO(QoS): change config value when we tie this to a configuration
 -        #           entry.
 -
 -        self.import_patcher = mock.patch(
 -            'oslo_utils.importutils.import_class',
 -            return_value=mock.Mock())
 -        self.import_patcher.start()
 +        # Don't rely on used driver
 +        mock.patch(
 +            'neutron.manager.NeutronManager.load_class_for_provider',
 +            return_value=mock.Mock(spec=qos_agent.QosAgentDriver)).start()
  
          self._create_fake_resource_rpc()
          self.qos_agent.initialize(self.resource_rpc_mock)