Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

tests/support.py

@@ -96,16 +96,20 @@ class FakeLogger:
 
     def __init__(self):
         self.channels_dict = defaultdict(list)
+        self.forgive_by_channel = defaultdict(lambda: False)
         self.unclosed_by_file = defaultdict(list)
 
     def _append_as(self, channel, line):
         self.channels_dict[channel].append(line)
 
     def check_empty_and_reset(self):
+        channels_dict = self.channels_dict
+        forgive_by_channel = self.forgive_by_channel
         unclosed_by_file = self.unclosed_by_file
 
         # reset the record of any logged messages
         self.channels_dict = defaultdict(list)
+        self.forgive_by_channel = defaultdict(lambda: False)
         self.unclosed_by_file = defaultdict(list)
 
         # complain loudly (and in detail) in the case of unclosed files
@@ -114,6 +118,15 @@ def check_empty_and_reset(self):
                                   for fname, (lineno, outname) in unclosed_by_file.items()})
             raise RuntimeError('unclosed files encountered:\n%s' % (messages,))
 
+        if channels_dict['error'] and not forgive_by_channel['error']:
+            raise RuntimeError('errors reported to logger:\n%s' % '\n'.join(channels_dict['error']))
+
+
+    def forgive_errors(self):
+        self.forgive_by_channel['error'] = True
+
+    # logger interface
+
     def debug(self, line):
         self._append_as('debug', line)
 
@@ -194,6 +207,8 @@ def setUp(self):
         self.before_each()
 
     def tearDown(self):
+        self.after_each()
+
         if not self._skip_logging:
             self._logger.check_empty_and_reset()
         if self._logger is not None:
@@ -210,6 +225,9 @@ def tearDown(self):
                 continue
 
     # hooks
+    def after_each(self):
+        pass
+
     def before_each(self):
         pass
 

tests/test_mig_shared_fileio.py

@@ -58,17 +58,23 @@ def setUp(self):
         cleanpath(os.path.dirname(DUMMY_FILE_WRITECHUNK), self)
 
     def test_return_false_on_invalid_data(self):
+        self.logger.forgive_errors()
+
         # NOTE: we make sure to disable any forced stringification here
         did_succeed = fileio.write_chunk(self.tmp_path, 1234, 0, self.logger,
                                          force_string=False)
         self.assertFalse(did_succeed)
 
     def test_return_false_on_invalid_offset(self):
+        self.logger.forgive_errors()
+
         did_succeed = fileio.write_chunk(self.tmp_path, DUMMY_BYTES, -42,
                                          self.logger)
         self.assertFalse(did_succeed)
 
     def test_return_false_on_invalid_dir(self):
+        self.logger.forgive_errors()
+
         os.makedirs(self.tmp_path)
 
         did_succeed = fileio.write_chunk(self.tmp_path, 1234, 0, self.logger)
@@ -138,18 +144,24 @@ def setUp(self):
         cleanpath(os.path.dirname(DUMMY_FILE_WRITEFILE), self)
 
     def test_return_false_on_invalid_data(self):
+        self.logger.forgive_errors()
+
         # NOTE: we make sure to disable any forced stringification here
         did_succeed = fileio.write_file(1234, self.tmp_path, self.logger,
                                         force_string=False)
         self.assertFalse(did_succeed)
 
     def test_return_false_on_invalid_dir(self):
+        self.logger.forgive_errors()
+
         os.makedirs(self.tmp_path)
 
         did_succeed = fileio.write_file(DUMMY_BYTES, self.tmp_path, self.logger)
         self.assertFalse(did_succeed)
 
     def test_return_false_on_missing_dir(self):
+        self.logger.forgive_errors()
+
         did_succeed = fileio.write_file(DUMMY_BYTES, self.tmp_path, self.logger,
                                         make_parent=False)
         self.assertFalse(did_succeed)