fixup! squash! temp file handling part 2

bleachbit · Feb 6, 2017 · 1bc6410 · 1bc6410
1 parent 77c3f78
commit 1bc6410
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tests/TestDeepScan.py b/tests/TestDeepScan.py
@@ -85,7 +85,7 @@ def test_delete(self):
         f_keep = self.write_file('foo.txt')
         subdir = os.path.join(self.tempdir, 'sub')
         os.mkdir(subdir)
-        f_del2 = self.write_file('sub/bar.ini.bbtestbak')
+        f_del2 = self.write_file(os.path.join(subdir,'bar.ini.bbtestbak'))
 
         # sanity check
         self.assertExists(f_del1)

diff --git a/tests/TestFileUtilities.py b/tests/TestFileUtilities.py
@@ -39,7 +39,7 @@
 def test_ini_helper(self, execute):
     """Used to test .ini cleaning in TestAction and in TestFileUtilities"""
 
-    teststr = '#Test\n[RecentsMRL]\nlist=C:\\Users\\me\\Videos\\movie.mpg,C:\\Users\\me\\movie2.mpg\n\n'
+    teststr = b'#Test\n[RecentsMRL]\nlist=C:\\Users\\me\\Videos\\movie.mpg,C:\\Users\\me\\movie2.mpg\n\n'
     # create test file
     filename = self.write_file('bleachbit-test-ini', teststr)
     self.assertExists(filename)

diff --git a/tests/common.py b/tests/common.py
@@ -95,8 +95,8 @@ def write_file(self, filename, contents=''):
         """Create a temporary file, optionally writing contents to it"""
         if not os.path.isabs(filename):
             filename = os.path.join(self.tempdir, filename)
-        filename = extended_path(filename)
-        with open(filename, 'w') as f:
+        #filename = extended_path(filename)
+        with open(filename, 'wb') as f:
             f.write(contents)
         assert (os.path.exists(filename))
         return filename