Browse Source

Add a dash to the prefix of the randomly named temporary directory to improve readability (#937).

Dan Helfman 6 months ago
parent
commit
b0cad58d6c
2 changed files with 5 additions and 4 deletions
  1. 2 1
      borgmatic/config/paths.py
  2. 3 3
      tests/unit/config/test_paths.py

+ 2 - 1
borgmatic/config/paths.py

@@ -70,7 +70,8 @@ class Runtime_directory:
             self.temporary_directory = None
             self.temporary_directory = None
         else:
         else:
             self.temporary_directory = tempfile.TemporaryDirectory(
             self.temporary_directory = tempfile.TemporaryDirectory(
-                prefix='borgmatic', dir=os.environ.get('TMPDIR') or os.environ.get('TEMP') or '/tmp'
+                prefix='borgmatic-',
+                dir=os.environ.get('TMPDIR') or os.environ.get('TEMP') or '/tmp',
             )
             )
             runtime_directory = self.temporary_directory.name
             runtime_directory = self.temporary_directory.name
 
 

+ 3 - 3
tests/unit/config/test_paths.py

@@ -101,7 +101,7 @@ def test_runtime_directory_falls_back_to_tmpdir_and_adds_temporary_subdirectory_
     temporary_directory = flexmock(name='/run/borgmatic-1234')
     temporary_directory = flexmock(name='/run/borgmatic-1234')
     temporary_directory.should_receive('cleanup').once()
     temporary_directory.should_receive('cleanup').once()
     flexmock(module.tempfile).should_receive('TemporaryDirectory').with_args(
     flexmock(module.tempfile).should_receive('TemporaryDirectory').with_args(
-        prefix='borgmatic', dir='/run'
+        prefix='borgmatic-', dir='/run'
     ).and_return(temporary_directory)
     ).and_return(temporary_directory)
 
 
     with module.Runtime_directory({}) as borgmatic_runtime_directory:
     with module.Runtime_directory({}) as borgmatic_runtime_directory:
@@ -119,7 +119,7 @@ def test_runtime_directory_falls_back_to_temp_and_adds_temporary_subdirectory_th
     temporary_directory = flexmock(name='/run/borgmatic-1234')
     temporary_directory = flexmock(name='/run/borgmatic-1234')
     temporary_directory.should_receive('cleanup').once()
     temporary_directory.should_receive('cleanup').once()
     flexmock(module.tempfile).should_receive('TemporaryDirectory').with_args(
     flexmock(module.tempfile).should_receive('TemporaryDirectory').with_args(
-        prefix='borgmatic', dir='/run'
+        prefix='borgmatic-', dir='/run'
     ).and_return(temporary_directory)
     ).and_return(temporary_directory)
 
 
     with module.Runtime_directory({}) as borgmatic_runtime_directory:
     with module.Runtime_directory({}) as borgmatic_runtime_directory:
@@ -137,7 +137,7 @@ def test_runtime_directory_falls_back_to_hard_coded_tmp_path_and_adds_temporary_
     temporary_directory = flexmock(name='/tmp/borgmatic-1234')
     temporary_directory = flexmock(name='/tmp/borgmatic-1234')
     temporary_directory.should_receive('cleanup').once()
     temporary_directory.should_receive('cleanup').once()
     flexmock(module.tempfile).should_receive('TemporaryDirectory').with_args(
     flexmock(module.tempfile).should_receive('TemporaryDirectory').with_args(
-        prefix='borgmatic', dir='/tmp'
+        prefix='borgmatic-', dir='/tmp'
     ).and_return(temporary_directory)
     ).and_return(temporary_directory)
 
 
     with module.Runtime_directory({}) as borgmatic_runtime_directory:
     with module.Runtime_directory({}) as borgmatic_runtime_directory: