cleans up code based on review

Signed-off-by: Ben Taitelbaum <ben@coshx.com>
docker · Mar 30, 2015 · 43ec323 · 43ec323
1 parent b35eedc
commit 43ec323
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
@@ -28,10 +28,8 @@ def loop(self, tail=True):
                 else:
                     yield item
             except Empty:
-                if tail:
-                    pass
-                else:
-                    break
+                if not tail:
+                    return
 
     def _init_readers(self):
         for generator in self.generators:

diff --git a/tests/unit/log_printer_test.py b/tests/unit/log_printer_test.py
@@ -45,7 +45,7 @@ def test_notail(self):
         def reader(*args, **kwargs):
             for count in xrange(3):
                 yield "keep going\n"
-                time.sleep(1)
+                time.sleep(0.2)
 
         container = MockContainer(reader)
         output = run_log_printer([container], monochrome=False, tail=False)
@@ -55,7 +55,7 @@ def test_tail(self):
         def reader(*args, **kwargs):
             for count in xrange(3):
                 yield "keep going\n"
-                time.sleep(1)
+                time.sleep(0.2)
 
         container = MockContainer(reader)
         output = run_log_printer([container], monochrome=False, tail=True)