Merge pull request #136 from desultory/dev

improve cleanup for out_dir testing

Author: desultory

tests/test_output_paths.py

@@ -41,23 +41,26 @@ def test_relative_out_file(self):
 
     def test_TMPDIR(self):
         """Tests that the TMPDIR environment variable is respected"""
-        from tempfile import TemporaryDirectory
         from os import environ
+        from tempfile import TemporaryDirectory
+
         try:
             with TemporaryDirectory() as tmpdir:
                 environ["TMPDIR"] = tmpdir
                 generator = InitramfsGenerator(logger=self.logger, config="tests/fullauto.toml")
                 generator.build()
                 self.assertTrue(Path(tmpdir).exists())
-                self.assertTrue((Path(tmpdir) / 'initramfs_test' / generator.out_file).exists())
+                self.assertTrue((Path(tmpdir) / "initramfs_test" / generator.out_file).exists())
         except Exception as e:
             self.fail(f"Exception: {e}")
         finally:
             environ.pop("TMPDIR")
 
     def test_implied_relative_output(self):
-        """ Tests implied relative output paths. Should resolve out_dir to the current dir. """
-        out_file = "implied/relative/path/initrd"
+        """Tests implied relative output paths. Should resolve out_dir to the current dir."""
+        from shutil import rmtree
+        out_base_dir = str(uuid4())
+        out_file = f"{out_base_dir}/implied/relative/path/initrd"
         generator = InitramfsGenerator(logger=self.logger, config="tests/fullauto.toml", out_file=out_file)
         out_path = Path(out_file)
         if out_path.exists():
@@ -68,8 +71,7 @@ def test_implied_relative_output(self):
         test_image = out_path.parent / generator["test_rootfs_name"]
         self.assertTrue(test_image.exists())
         test_image.unlink()
-        generator["out_dir"].rmdir()
-
+        rmtree(out_base_dir)
 
 
 if __name__ == "__main__":