kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 20:50:10 +01:00
Code Activity

tests: name temp test dir after test function that used it

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2017-11-30 09:59:02 +01:00
parent 30b2f5a48a
commit 3ff4b656c6
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/common.TestCase
View File

@ -96,8 +96,8 @@ class CommonTest(unittest.TestCase):
print('no build-tools found: ' + build_tools) print('no build-tools found: ' + build_tools)
def test_find_java_root_path(self): def test_find_java_root_path(self):
tmptestsdir = tempfile.mkdtemp(prefix='test_find_java_root_path', dir=self.tmpdir) testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
os.chdir(tmptestsdir) os.chdir(testdir)
all_pathlists = [ all_pathlists = [
([ # Debian ([ # Debian
@ -215,7 +215,7 @@ class CommonTest(unittest.TestCase):
def test_prepare_sources_refresh(self): def test_prepare_sources_refresh(self):
packageName = 'org.fdroid.ci.test.app' 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) print('testdir', testdir)
os.chdir(testdir) os.chdir(testdir)
os.mkdir('build') os.mkdir('build')
@ -262,7 +262,7 @@ class CommonTest(unittest.TestCase):
fdroidserver.signindex.config = config fdroidserver.signindex.config = config
sourcedir = os.path.join(self.basedir, 'signindex') 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',): for f in ('testy.jar', 'guardianproject.jar',):
sourcefile = os.path.join(sourcedir, f) sourcefile = os.path.join(sourcedir, f)
testfile = os.path.join(testsdir, f) testfile = os.path.join(testsdir, f)
@ -291,7 +291,7 @@ class CommonTest(unittest.TestCase):
sourceapk = os.path.join(self.basedir, 'urzip.apk') 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) print('testdir', testdir)
copyapk = os.path.join(testdir, 'urzip-copy.apk') copyapk = os.path.join(testdir, 'urzip-copy.apk')

3
tests/lint.TestCase
View File

@ -32,8 +32,7 @@ class LintTest(unittest.TestCase):
self.assertTrue(fdroidserver.lint.check_for_unsupported_metadata_files()) self.assertTrue(fdroidserver.lint.check_for_unsupported_metadata_files())
tmpdir = os.path.join(localmodule, '.testfiles') tmpdir = os.path.join(localmodule, '.testfiles')
tmptestsdir = tempfile.mkdtemp(prefix='test_check_for_unsupported_metadata_files-', tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=tmpdir)
dir=tmpdir)
self.assertFalse(fdroidserver.lint.check_for_unsupported_metadata_files(tmptestsdir + '/')) self.assertFalse(fdroidserver.lint.check_for_unsupported_metadata_files(tmptestsdir + '/'))
shutil.copytree(os.path.join(localmodule, 'tests', 'metadata'), shutil.copytree(os.path.join(localmodule, 'tests', 'metadata'),
os.path.join(tmptestsdir, 'metadata'), os.path.join(tmptestsdir, 'metadata'),

6
tests/update.TestCase
View File

@ -87,7 +87,7 @@ class UpdateTest(unittest.TestCase):
tmpdir = os.path.join(localmodule, '.testfiles') tmpdir = os.path.join(localmodule, '.testfiles')
if not os.path.exists(tmpdir): if not os.path.exists(tmpdir):
os.makedirs(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) packageDir = os.path.join(tmptestsdir, 'build', packageName)
shutil.copytree(importer, packageDir) shutil.copytree(importer, packageDir)
@ -374,7 +374,7 @@ class UpdateTest(unittest.TestCase):
tmpdir = os.path.join(localmodule, '.testfiles') tmpdir = os.path.join(localmodule, '.testfiles')
if not os.path.exists(tmpdir): if not os.path.exists(tmpdir):
os.makedirs(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) dir=tmpdir)
print('tmptestsdir', tmptestsdir) print('tmptestsdir', tmptestsdir)
os.chdir(tmptestsdir) os.chdir(tmptestsdir)
@ -504,7 +504,7 @@ class UpdateTest(unittest.TestCase):
tmpdir = os.path.join(localmodule, '.testfiles') tmpdir = os.path.join(localmodule, '.testfiles')
if not os.path.exists(tmpdir): if not os.path.exists(tmpdir):
os.makedirs(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) dir=tmpdir)
print('tmptestsdir', tmptestsdir) print('tmptestsdir', tmptestsdir)
os.chdir(tmptestsdir) os.chdir(tmptestsdir)