From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 8 Sep 2011 23:32:18 +0000 (-0700)
Subject: merge salv fix for bug 841982, fix minor pep8 violation
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=91430f20a1558f336bde2edd41d968e7cfd412d0;p=openstack-build%2Fneutron-build.git

merge salv fix for bug 841982, fix minor pep8 violation
---

91430f20a1558f336bde2edd41d968e7cfd412d0
diff --cc tests/unit/test_api.py
index 70af451d3,a0907d1e3..81bcb70a6
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@@ -298,6 -298,14 +298,15 @@@ class APITest(unittest.TestCase)
          self.assertEqual(len(port_data['ports']), 2)
          LOG.debug("_test_list_ports - format:%s - END", format)
  
+     def _test_list_ports_networknotfound(self, format):
 -        LOG.debug("_test_list_ports_networknotfound - format:%s - START", format)
++        LOG.debug("_test_list_ports_networknotfound"
++                    " - format:%s - START", format)
+         list_port_req = testlib.port_list_request(self.tenant_id,
+                                                   "A_BAD_ID", format)
+         list_port_res = list_port_req.get_response(self.api)
+         self.assertEqual(list_port_res.status_int, 420)
+         LOG.debug("_test_list_ports_networknotfound - format:%s - END", format)
+ 
      def _test_list_ports_detail(self, format):
          LOG.debug("_test_list_ports_detail - format:%s - START", format)
          content_type = "application/%s" % format