test: use suffixes and prefixes in tmpdir names

Signed-off-by: Ruslan Kuprieiev <[email protected]>
This commit is contained in:
Ruslan Kuprieiev
2018-10-14 00:37:02 +03:00
parent a0b5bdd143
commit 31fed211f6
5 changed files with 15 additions and 11 deletions
+9 -1
View File
@@ -1,4 +1,5 @@
import os
import uuid
import shutil
import tempfile
from git import Repo
@@ -38,8 +39,15 @@ class TestDir(TestCase):
with open(name, 'a') as f:
f.write(contents)
@staticmethod
def mkdtemp():
prefix = 'dvc-test.{}.'.format(os.getpid())
suffix = '.{}'.format(uuid.uuid4())
return tempfile.mkdtemp(prefix=prefix, suffix=suffix)
def setUp(self):
self._root_dir = tempfile.mkdtemp()
self._root_dir = TestDir.mkdtemp()
self._pushd(self._root_dir)
self.create(self.FOO, self.FOO_CONTENTS)
self.create(self.BAR, self.BAR_CONTENTS)
+1 -2
View File
@@ -2,7 +2,6 @@ import os
import stat
import shutil
import filecmp
import tempfile
from dvc.main import main
from dvc.utils import file_md5
@@ -132,7 +131,7 @@ class TestAddFileInDir(TestDvc):
class TestAddExternalLocalFile(TestDvc):
def test(self):
dname = tempfile.mkdtemp()
dname = TestDvc.mkdtemp()
fname = os.path.join(dname, 'foo')
shutil.copyfile(self.FOO, fname)
+1 -2
View File
@@ -1,6 +1,5 @@
import os
import shutil
import tempfile
from dvc.cache import Cache
from dvc.system import System
@@ -52,7 +51,7 @@ class TestCacheLoadBadDirCache(TestDvc):
class TestExternalCacheDir(TestDvc):
def test(self):
cache_dir = tempfile.mkdtemp()
cache_dir = TestDvc.mkdtemp()
ret = main(['config', 'cache.dir', cache_dir])
self.assertEqual(ret, 0)
+2 -3
View File
@@ -6,7 +6,6 @@ import time
import uuid
import shutil
import getpass
import tempfile
import platform
from dvc.main import main
@@ -105,7 +104,7 @@ def _should_test_hdfs():
def get_local_storagepath():
return tempfile.mkdtemp()
return TestDvc.mkdtemp()
def get_local_url():
@@ -164,7 +163,7 @@ class TestDataCloud(TestDvc):
clist = [('s3://', RemoteS3),
('gs://', RemoteGS),
('ssh://user@localhost:/', RemoteSSH),
(tempfile.mkdtemp(), RemoteLOCAL)]
(TestDvc.mkdtemp(), RemoteLOCAL)]
if _should_test_azure():
clist.append(('azure://ContainerName=', RemoteAzure))
+2 -3
View File
@@ -4,7 +4,6 @@ import stat
import shutil
import filecmp
import getpass
import tempfile
import posixpath
from subprocess import Popen, PIPE
@@ -655,7 +654,7 @@ class TestReproExternalSSH(TestReproExternalBase):
@property
def bucket(self):
if not self._dir:
self._dir = tempfile.mkdtemp()
self._dir = TestDvc.mkdtemp()
return '{}@127.0.0.1:{}'.format(getpass.getuser(), self._dir)
def cmd(self, i, o):
@@ -702,7 +701,7 @@ class TestReproExternalSSH(TestReproExternalBase):
class TestReproExternalLOCAL(TestReproExternalBase):
def setUp(self):
super(TestReproExternalLOCAL, self).setUp()
self.tmpdir = tempfile.mkdtemp()
self.tmpdir = TestDvc.mkdtemp()
def should_test(self):
return True