gpg: Handle temp directory containing files (#5063)

cloudinit/gpg.py

@@ -53,7 +53,7 @@ def cleanup(self) -> None:
         """cleanup the gpg temporary directory and kill gpg"""
         self.kill_gpg()
         if self.temp_dir and os.path.isdir(self.temp_dir.name):
-            os.rmdir(self.temp_dir.name)
+            self.temp_dir.cleanup()
 
     def export_armour(self, key: str) -> Optional[str]:
         """Export gpg key, armoured key gets returned"""

tests/unittests/conftest.py

@@ -1,6 +1,7 @@
 import builtins
 import glob
 import os
+import shutil
 from pathlib import Path
 from unittest import mock
 
@@ -67,6 +68,9 @@ def m_gpg():
         ("write_file", 1),
         ("write_json", 1),
     ],
+    shutil: [
+        ("rmtree", 1),
+    ],
 }