avoid leaving stray temp files

tests/test_builder/test_build_notification.py

@@ -8,6 +8,7 @@ import time
 import unittest
 
 import mock
+import shutil
 import six
 
 import koji
@@ -71,6 +72,7 @@ class TestBuildNotification(unittest.TestCase):
             os.environ['TZ'] = self.original_timezone
         time.tzset()
         mock.patch.stopall()
+        shutil.rmtree(self.tempdir)
 
     def test_build_notification(self):
         # force locale to compare 'message' value

tests/test_builder/test_choose_taskarch.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 import mock
 import rpm
+import shutil
 import tempfile
 import unittest
 import koji
@@ -27,9 +28,9 @@ class TestChooseTaskarch(unittest.TestCase):
         self.session = mock.MagicMock()
         self.options = mock.MagicMock()
         self.options.literal_task_arches = ''
-        workdir = tempfile.mkdtemp()
+        self.workdir = tempfile.mkdtemp()
         self.handler = kojid.BuildTask(task_id, method, params, self.session,
-                self.options, workdir)
+                self.options, self.workdir)
 
         # mock some more things
         self.handler.event_id = 42
@@ -39,6 +40,9 @@ class TestChooseTaskarch(unittest.TestCase):
         self.session.getBuildConfig = self.getBuildConfig
         self.getBuildConfig.return_value = {'arches': 'armv7hl i686 x86_64 ppc64'}
 
+    def tearDown(self):
+        shutil.rmtree(self.workdir)
+
     def test_binary_arches(self):
         for arch in ['i386', 'i686', 'x86_64', 'ppc', 'ppc64le', 's390',
                     's390x']:

tests/test_builder/test_main.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 import mock
 import signal
-import tempfile
 import unittest
 from six.moves import range
 
@@ -23,7 +22,6 @@ class TestMain(unittest.TestCase):
         self.options.plugin = []
         self.options.sleeptime = 1
         self.options.pluginpath = ''
-        workdir = tempfile.mkdtemp()
         self.setup_rlimits = mock.patch('koji.util.setup_rlimits').start()
         self.TaskManager = mock.MagicMock()
         # the kojid import is weird, so we use patch.object

tests/test_builder/test_volume_id.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 import mock
+import shutil
 import tempfile
 import unittest
 from .loadkojid import kojid
@@ -75,9 +76,12 @@ class TestVolumeID(unittest.TestCase):
         self.session = mock.MagicMock()
         self.options = mock.MagicMock()
         self.options.literal_task_arches = ''
-        workdir = tempfile.mkdtemp()
+        self.workdir = tempfile.mkdtemp()
         self.handler = kojid.LiveCDTask(task_id, method, params, self.session,
-                                        self.options, workdir)
+                                        self.options, self.workdir)
+
+    def tearDown(self):
+        shutil.rmtree(self.workdir)
 
     def test_volume_id_substitutions(self):
         """Check that volume ID is shorten corect by shortenVolID method."""