Merge lp:~ed.so/duplicity/tempfile.tempdir into lp:~duplicity-team/duplicity/0.7-series

[edso]

make sure packages using python's tempfile create temp files in duplicity's temp dir

Ken, please try again :) toxed and everything

[Kenneth Loafman (kenneth-loafman)]

edso, this one fails tox tests with 33 errors.

review: Needs Fixing

[edso (ed.so)]

On 18.10.2015 19:28, Kenneth Loafman wrote:
> Review: Needs Fixing
>
> edso, this one fails tox tests with 33 errors.
>

hey Ken,

i have no tox set up here. it's a simple one liner so it's probably no syntax issue but the test's are at fault? essentially it makes the duplicity generated temp folder the base folder _all_ file(path)s generated via python tempfile.

will check what's going on. ..thx ede

[edso (ed.so)]

Ken, please try again :) toxed and everything

[Kenneth Loafman (kenneth-loafman)]

Thanks ede. The added tests are a big help.

[edso (ed.so)]

On 01.11.2015 13:55, Kenneth Loafman wrote:
> Thanks ede. The added tests are a big help.
>

thx, never too old to learn i guess ;).. ede

=== modified file 'duplicity/tempdir.py'
--- duplicity/tempdir.py	2015-01-31 23:30:49 +0000
+++ duplicity/tempdir.py	2015-10-31 20:34:16 +0000
@@ -38,6 +38,9 @@
 # instance
 _defaultLock = threading.Lock()
 _defaultInstance = None
+# backup the initial tmp dir path because we will force tempfile
+# later to use our generated _defaultInstance.dir() as temproot
+_initialSystemTempRoot = tempfile.gettempdir()
 
 
 def default():
@@ -57,6 +60,8 @@
     try:
         if _defaultInstance is None or _defaultInstance.dir() is None:
             _defaultInstance = TemporaryDirectory(temproot=globals.temproot)
+            # set the temp dir to be the default in tempfile module from now on
+            tempfile.tempdir = _defaultInstance.dir()
         return _defaultInstance
     finally:
         _defaultLock.release()
@@ -116,6 +121,12 @@
         tempbase - The temp root directory, or None to use system
         default (recommended).
         """
+        if temproot is None:
+            if globals.temproot:
+                temproot = globals.temproot
+            else:
+                global _initialSystemTempRoot
+                temproot = _initialSystemTempRoot
         self.__dir = tempfile.mkdtemp("-tempdir", "duplicity-", temproot)
 
         log.Info(_("Using temporary directory %s") % util.ufn(self.__dir))

=== modified file 'testing/unit/test_tempdir.py'
--- testing/unit/test_tempdir.py	2015-08-01 12:05:34 +0000
+++ testing/unit/test_tempdir.py	2015-10-31 20:34:16 +0000
@@ -20,6 +20,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 import os
+import tempfile
 import unittest
 
 from duplicity import tempdir
@@ -30,20 +31,57 @@
     def test_all(self):
         td = tempdir.default()
 
+        # are generated temp files unique?
         self.assertTrue(td.mktemp() != td.mktemp())
 
+        # create and remove a temp dir 
         dir = td.mktemp()
         os.mkdir(dir)
         os.rmdir(dir)
 
+        # test mkstemp()
         fd, fname = td.mkstemp()
         os.close(fd)
         os.unlink(fname)
         td.forget(fname)
 
+        # test mkstemp_file()
         fo, fname = td.mkstemp_file()
         fo.close()  # don't forget, leave to cleanup()
 
+        # cleanup
+        td.cleanup()
+
+    def test_dirname(self):
+        """
+        test if we generated a dirname
+        """ 
+        td = tempdir.default()
+        dirname = td.dir()
+        self.assertTrue( dirname is not None )
+        
+        """
+        test if duplicity's temp files are created in our temp dir
+        """ 
+        f1d, f1_name = tempdir.default().mkstemp()
+        f1_dirname = os.path.dirname( f1_name )
+        
+        self.assertTrue( dirname == f1_dirname )
+        
+        """
+        test if tempfile creates in our temp dir now as well by default
+        """ 
+        f2 = tempfile.NamedTemporaryFile()
+        f2_dirname = os.path.dirname( f2.name )
+        
+        self.assertTrue( dirname == f2_dirname )
+        
+        # cleanup
+        os.close(f1d)
+        os.unlink(f1_name)
+        td.forget(f1_name)
+        f2.close()
+        
         td.cleanup()
 
 if __name__ == "__main__":