Merge lp:~wgrant/launchpad/bug-752149 into lp:launchpad

[William Grant]

[r=lifeless][bug=752149] CommandSpawner's OutputLineHandler now correctly clears the buffer when a complete line is received.

Not much to say beyond the bug description and test.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/lp/services/command_spawner.py'
--- lib/lp/services/command_spawner.py	2011-02-01 20:01:58 +0000
+++ lib/lp/services/command_spawner.py	2011-04-06 03:45:49 +0000
@@ -224,11 +224,10 @@
         Any trailing text not (yet) terminated with a newline is buffered.
         """
         lines = (self.incomplete_buffer + output).split("\n")
-        if not output.endswith("\n") and len(lines) > 0:
+        if len(lines) > 0:
             self.incomplete_buffer = lines[-1]
-            lines = lines[:-1]
-        for line in lines:
-            self.process_line(line)
+            for line in lines[:-1]:
+                self.process_line(line)
 
     def finalize(self):
         """Process the remaining incomplete line, if any."""

=== modified file 'lib/lp/services/tests/test_command_spawner.py'
--- lib/lp/services/tests/test_command_spawner.py	2011-02-01 19:51:46 +0000
+++ lib/lp/services/tests/test_command_spawner.py	2011-04-06 03:45:49 +0000
@@ -367,6 +367,13 @@
         self.handler("i\n")
         self.assertEqual(["hi"], self._getLines())
 
+    def test_clears_buffer_after_joining_lines(self):
+        self.handler("hi")
+        self.handler("!\n")
+        self.assertEqual(["hi!"], self._getLines())
+        self.handler("!\n")
+        self.assertEqual(["hi!", "!"], self._getLines())
+
     def test_finalize_processes_remaining_partial_line(self):
         self.handler("foo")
         self.handler.finalize()