From 3ff4b656c6d7cf43ec59f0caccf8d911beb11310 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 30 Nov 2017 09:59:02 +0100 Subject: [PATCH] tests: name temp test dir after test function that used it --- tests/common.TestCase | 10 +++++----- tests/lint.TestCase | 3 +-- tests/update.TestCase | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/common.TestCase b/tests/common.TestCase index 84ea77fa..87e9da74 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -96,8 +96,8 @@ class CommonTest(unittest.TestCase): print('no build-tools found: ' + build_tools) def test_find_java_root_path(self): - tmptestsdir = tempfile.mkdtemp(prefix='test_find_java_root_path', dir=self.tmpdir) - os.chdir(tmptestsdir) + testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir) + os.chdir(testdir) all_pathlists = [ ([ # Debian @@ -215,7 +215,7 @@ class CommonTest(unittest.TestCase): def test_prepare_sources_refresh(self): packageName = 'org.fdroid.ci.test.app' - testdir = tempfile.mkdtemp(prefix='test_prepare_sources_refresh', dir=self.tmpdir) + testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir) print('testdir', testdir) os.chdir(testdir) os.mkdir('build') @@ -262,7 +262,7 @@ class CommonTest(unittest.TestCase): fdroidserver.signindex.config = config sourcedir = os.path.join(self.basedir, 'signindex') - testsdir = tempfile.mkdtemp(prefix='test_signjar', dir=self.tmpdir) + testsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir) for f in ('testy.jar', 'guardianproject.jar',): sourcefile = os.path.join(sourcedir, f) testfile = os.path.join(testsdir, f) @@ -291,7 +291,7 @@ class CommonTest(unittest.TestCase): sourceapk = os.path.join(self.basedir, 'urzip.apk') - testdir = tempfile.mkdtemp(prefix='test_verify_apks', dir=self.tmpdir) + testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir) print('testdir', testdir) copyapk = os.path.join(testdir, 'urzip-copy.apk') diff --git a/tests/lint.TestCase b/tests/lint.TestCase index f2a411c5..433c0787 100755 --- a/tests/lint.TestCase +++ b/tests/lint.TestCase @@ -32,8 +32,7 @@ class LintTest(unittest.TestCase): self.assertTrue(fdroidserver.lint.check_for_unsupported_metadata_files()) tmpdir = os.path.join(localmodule, '.testfiles') - tmptestsdir = tempfile.mkdtemp(prefix='test_check_for_unsupported_metadata_files-', - dir=tmpdir) + tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=tmpdir) self.assertFalse(fdroidserver.lint.check_for_unsupported_metadata_files(tmptestsdir + '/')) shutil.copytree(os.path.join(localmodule, 'tests', 'metadata'), os.path.join(tmptestsdir, 'metadata'), diff --git a/tests/update.TestCase b/tests/update.TestCase index 8a88fc4e..966e00e9 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -87,7 +87,7 @@ class UpdateTest(unittest.TestCase): tmpdir = os.path.join(localmodule, '.testfiles') if not os.path.exists(tmpdir): os.makedirs(tmpdir) - tmptestsdir = tempfile.mkdtemp(prefix='test_insert_triple_t_metadata-', dir=tmpdir) + tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=tmpdir) packageDir = os.path.join(tmptestsdir, 'build', packageName) shutil.copytree(importer, packageDir) @@ -374,7 +374,7 @@ class UpdateTest(unittest.TestCase): tmpdir = os.path.join(localmodule, '.testfiles') if not os.path.exists(tmpdir): os.makedirs(tmpdir) - tmptestsdir = tempfile.mkdtemp(prefix='test_process_apk_signed_by_disabled_algorithms-', + tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=tmpdir) print('tmptestsdir', tmptestsdir) os.chdir(tmptestsdir) @@ -504,7 +504,7 @@ class UpdateTest(unittest.TestCase): tmpdir = os.path.join(localmodule, '.testfiles') if not os.path.exists(tmpdir): os.makedirs(tmpdir) - tmptestsdir = tempfile.mkdtemp(prefix='test_create_metadata_from_template-', + tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=tmpdir) print('tmptestsdir', tmptestsdir) os.chdir(tmptestsdir)