added some more flushes in the hopes of fixing the random failures on…

… travis and appveyor

sacred/experiment.py

@@ -139,10 +139,12 @@ def option_hook(self, function):
         dictionary. That is, the dictionary of commandline options used for
         this run.
 
-        NOTE: The decorated function MUST have an argument called options.
-        NOTE: While the options still contain the COMMAND and UPDATE entries,
-              changing them has no effect. Only flags (starting with '--') can
-              be modified.
+        .. note::
+            The decorated function MUST have an argument called options.
+
+            The options also contain ``'COMMAND'`` and ``'UPDATE'`` entries,
+            but changing them has no effect. Only modification on
+            flags (entries starting with ``'--'``) are considered.
         """
         sig = Signature(function)
         if "options" not in sig.arguments:

sacred/run.py

@@ -11,7 +11,8 @@
 import tempfile
 
 from sacred.randomness import set_global_seed
-from sacred.utils import tee_output, ObserverError, SacredInterrupt, join_paths
+from sacred.utils import (tee_output, ObserverError, SacredInterrupt,
+                          join_paths, flush)
 
 
 __sacred__ = True  # marks files that should be filtered from stack traces
@@ -195,16 +196,18 @@ def __call__(self, *args):
                 raise
             finally:
                 self._warn_about_failed_observers()
-                self.captured_out = self._get_captured_output()
+                self._get_captured_output()
 
         return self.result
 
     def _get_captured_output(self):
+        flush()
+        self._output_file.flush()
         self._output_file.seek(0)
         text = self._output_file.read().decode()
         if self.captured_out_filter is not None:
             text = self.captured_out_filter(text)
-        return text
+        self.captured_out = text
 
     def _start_heartbeat(self):
         self._emit_heartbeat()
@@ -272,7 +275,7 @@ def _emit_started(self):
 
     def _emit_heartbeat(self):
         beat_time = datetime.datetime.now()
-        self.captured_out = self._get_captured_output()
+        self._get_captured_output()
         for observer in self.observers:
             self._safe_call(observer, 'heartbeat_event',
                             info=self.info,

sacred/utils.py

@@ -158,6 +158,7 @@ def tee_output(target):
         tee_stdout.wait()
         tee_stderr.wait()
     finally:
+        flush()
         os.close(saved_stdout_fd)
         os.close(saved_stderr_fd)
 

tests/test_utils.py

@@ -164,6 +164,7 @@ def test_convert_camel_case_to_snake_case(name, expected):
     ('abc\rdef', 'def'),
     ('abc\r', 'abc'),
     ('abc\rd', 'dbc'),
+    ('abc\r\nd', 'abc\nd'),
     ('abc\ndef\rg', 'abc\ngef'),
     ('abc\ndef\r\rg', 'abc\ngef')
 ])