Merge "Remove workaround for bug #1219530"
This commit is contained in:
commit
47d061cabf
|
@ -42,13 +42,6 @@ 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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue