From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Thu, 5 Mar 2015 00:22:04 +0000 (+0900)
Subject: OVS DVR UT: Remove an inappropriate str() conversion
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ec7ccaeb2df8ec9244b0e88488ab3939b989b1bf;p=openstack-build%2Fneutron-build.git

OVS DVR UT: Remove an inappropriate str() conversion

db_get_val would return None, not 'None'.
This also makes the code consistent with the other copies.

Change-Id: Iccf68bf172bfe07ff8913505466f86f024ae6415
---

diff --git a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py
index 9fb0fdacf..80f02c240 100644
--- a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py
@@ -146,7 +146,7 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase):
             with contextlib.nested(
                 mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'
                            'db_get_val',
-                           return_value=str(self._old_local_vlan)),
+                           return_value=self._old_local_vlan),
                 mock.patch.object(self.agent.dvr_agent.plugin_rpc,
                                   'get_subnet_for_dvr',
                                   return_value={