From: Kevin Benton <blak111@gmail.com>
Date: Fri, 30 May 2014 04:15:22 +0000 (-0700)
Subject: Improve readability of MagicMock use in RYU test
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=beccd7cda8a4e33968eb5cb4d70fb89d5b471f8f;p=openstack-build%2Fneutron-build.git

Improve readability of MagicMock use in RYU test

Replaces an unnecessarily complex setup of a magicmock
in an RYU test module.

Change-Id: If2e99ff76114d896a6480a884a531f901198caa5
---

diff --git a/neutron/tests/unit/ryu/test_ryu_security_group.py b/neutron/tests/unit/ryu/test_ryu_security_group.py
index 16f92f088..aadbe8266 100644
--- a/neutron/tests/unit/ryu/test_ryu_security_group.py
+++ b/neutron/tests/unit/ryu/test_ryu_security_group.py
@@ -38,10 +38,7 @@ class RyuSecurityGroupsTestCase(test_sg.SecurityGroupDBTestCase):
     def setUp(self, plugin=None):
         test_sg_rpc.set_firewall_driver(test_sg_rpc.FIREWALL_HYBRID_DRIVER)
         self.fake_ryu = fake_ryu.patch_fake_ryu_client().start()
-        notifier_p = mock.patch(NOTIFIER)
-        notifier_cls = notifier_p.start()
-        self.notifier = mock.Mock()
-        notifier_cls.return_value = self.notifier
+        self.notifier = mock.patch(NOTIFIER).start().return_value
         self._attribute_map_bk_ = {}
         for item in attributes.RESOURCE_ATTRIBUTE_MAP:
             self._attribute_map_bk_[item] = (attributes.