Merge pull request #16 from kyleknap/fix-tests-again

Fix some windows unit tests
kdaily · Jun 15, 2016 · 75fed7e · 75fed7e
2 parents a16ce0e + 5d8e522
commit 75fed7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/tests/unit/test_upload.py b/tests/unit/test_upload.py
@@ -167,11 +167,14 @@ def setUp(self):
         super(TestUploadSeekableInputManager, self).setUp()
         self.upload_input_manager = UploadSeekableInputManager(self.osutil)
         self.fileobj = open(self.filename, 'rb')
-        self.addCleanup(self.fileobj.close)
         self.call_args = CallArgs(
             fileobj=self.fileobj, subscribers=self.subscribers)
         self.future = self.get_transfer_future(self.call_args)
 
+    def tearDown(self):
+        self.fileobj.close()
+        super(TestUploadSeekableInputManager, self).tearDown()
+
 
 class TestUploadSubmissionTask(BaseSubmissionTaskTest):
     def setUp(self):

diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
@@ -205,6 +205,10 @@ def setUp(self):
         self.open_called_count = 0
         self.deferred_open_file.OPEN_METHOD = self.counting_open_method
 
+    def tearDown(self):
+        self.deferred_open_file.close()
+        super(TestDefferedOpenFile, self).tearDown()
+
     def counting_open_method(self, filename, mode):
         self.open_called_count += 1
         return open(filename, mode)