Remove workaround for bug #1219530

Bug #1219530 has been fixed before Havana. We can remove this workaround.

Closes-Bug: #1307472
Change-Id: Ib0b1abf7d11627045be922f79aff6b80448ccbf4

diff --git a/neutron/agent/linux/ovsdb_monitor.py b/neutron/agent/linux/ovsdb_monitor.py
index 40ba6114ffba7c11ec811abd239e96d137793c6b..33f1c5e72c97b5d72e8a84a69f36cb737b33bade 100644 (file)
--- a/neutron/agent/linux/ovsdb_monitor.py
+++ b/neutron/agent/linux/ovsdb_monitor.py
@@ -42,16 +42,9 @@ class OvsdbMonitor(async_process.AsyncProcess):
         data = self._process.stdout.readline()
         if not data:
             return
-        #TODO(marun) The default root helper outputs exit errors to
-        # stdout due to bug #1219530.  This check can be moved to
-        # _read_stderr once the error is correctly output to stderr.
-        if self.root_helper and self.root_helper in data:
-            self._stderr_lines.put(data)
-            LOG.error(_('Error received from ovsdb monitor: %s') % data)
-        else:
-            self._stdout_lines.put(data)
-            LOG.debug(_('Output received from ovsdb monitor: %s') % data)
-            return data
+        self._stdout_lines.put(data)
+        LOG.debug(_('Output received from ovsdb monitor: %s') % data)
+        return data
 
     def _read_stderr(self):
         data = super(OvsdbMonitor, self)._read_stderr()

diff --git a/neutron/tests/unit/agent/linux/test_ovsdb_monitor.py b/neutron/tests/unit/agent/linux/test_ovsdb_monitor.py
index 20cd4742cd1f57a74de6979f28624910fdffc977..ec37f83aa0f59abf8efea898760bbadffa3ce1ba 100644 (file)
--- a/neutron/tests/unit/agent/linux/test_ovsdb_monitor.py
+++ b/neutron/tests/unit/agent/linux/test_ovsdb_monitor.py
@@ -43,13 +43,6 @@ class TestOvsdbMonitor(base.BaseTestCase):
         result = self.read_output_queues_and_returns_result('stdout', '')
         self.assertIsNone(result)
 
-    def test__read_stdout_queues_root_wrapper_errors_to_stderr_output(self):
-        result = self.read_output_queues_and_returns_result('stdout',
-                                                            self.root_helper)
-        self.assertIsNone(result)
-        self.assertEqual(self.monitor._stderr_lines.get_nowait(),
-                         self.root_helper)
-
     def test__read_stdout_queues_normal_output_to_stdout_queue(self):
         output = 'foo'
         result = self.read_output_queues_and_returns_result('stdout', output)