From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Fri, 21 Feb 2014 09:25:28 +0000 (+0900)
Subject: Fix test_db_plugin.test_delete_port
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f826ed84df8d1ddf8a77ca28554ce8b899b4d735;p=openstack-build%2Fneutron-build.git

Fix test_db_plugin.test_delete_port

Also add PortNotFound check to test_delete_port_public_network.

Change-Id: Iec461364345b200e2d17ba26a6c5362eec6d93ef
Closes-Bug: #1282946
---

diff --git a/neutron/tests/unit/test_db_plugin.py b/neutron/tests/unit/test_db_plugin.py
index c77f9b798..eb0ec34e6 100644
--- a/neutron/tests/unit/test_db_plugin.py
+++ b/neutron/tests/unit/test_db_plugin.py
@@ -1073,10 +1073,10 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s
             self.assertEqual(port['port']['id'], sport['port']['id'])
 
     def test_delete_port(self):
-        with self.port() as port:
-            req = self.new_show_request('port', self.fmt, port['port']['id'])
-            res = req.get_response(self.api)
-            self.assertEqual(res.status_int, webob.exc.HTTPNotFound.code)
+        with self.port(no_delete=True) as port:
+            self._delete('ports', port['port']['id'])
+            self._show('ports', port['port']['id'],
+                       expected_code=webob.exc.HTTPNotFound.code)
 
     def test_delete_port_public_network(self):
         with self.network(shared=True) as network:
@@ -1087,9 +1087,9 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s
                                          set_context=True)
 
             port = self.deserialize(self.fmt, port_res)
-            # delete the port
             self._delete('ports', port['port']['id'])
-            # Todo: verify!!!
+            self._show('ports', port['port']['id'],
+                       expected_code=webob.exc.HTTPNotFound.code)
 
     def test_update_port(self):
         with self.port() as port: