kallithea Changeset - 38917ced2519

Changeset - 38917ced2519

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Branko Majic (branko) - 8 years ago 2018-01-31 13:57:52
branko@majic.rs

Grafted from: 72cf8ab299dd

tests: fix TESTS_TMP_PATH naming

6 files changed with 27 insertions and 28 deletions:

kallithea/tests/vcs/conf.py

kallithea/tests/vcs/test_archives.py

kallithea/tests/vcs/test_git.py

kallithea/tests/vcs/test_hg.py

kallithea/tests/vcs/test_utils.py

kallithea/tests/vcs/test_vcs.py

0 comments (0 inline, 0 general)

kallithea/tests/vcs/conf.py

➞

Show inline comments

@@ @@ -14,36 +14,35 @@ __all__ = ( @@
 SCM_TESTS = ['hg', 'git']
 THIS = os.path.abspath(os.path.dirname(__file__))
 GIT_REMOTE_REPO = 'git://github.com/codeinn/vcs.git'
 # Note: TEST_TMP_PATH, not TESTS_TMP_PATH
 TEST_TMP_PATH = os.environ.get('VCS_TEST_ROOT', tempfile.gettempdir())
 TESTS_TMP_PATH = os.environ.get('VCS_TEST_ROOT', tempfile.gettempdir())
 TEST_GIT_REPO = os.environ.get('VCS_TEST_GIT_REPO',
-                               os.path.join(TEST_TMP_PATH, 'vcs-git'))
+                               os.path.join(TESTS_TMP_PATH, 'vcs-git'))
 TEST_GIT_REPO_CLONE = os.environ.get('VCS_TEST_GIT_REPO_CLONE',
-                                     os.path.join(TEST_TMP_PATH, 'vcs-git-clone'))
+                                     os.path.join(TESTS_TMP_PATH, 'vcs-git-clone'))
 TEST_GIT_REPO_PULL = os.environ.get('VCS_TEST_GIT_REPO_PULL',
-                                    os.path.join(TEST_TMP_PATH, 'vcs-git-pull'))
+                                    os.path.join(TESTS_TMP_PATH, 'vcs-git-pull'))
 HG_REMOTE_REPO = 'http://bitbucket.org/marcinkuzminski/vcs'
 TEST_HG_REPO = os.environ.get('VCS_TEST_HG_REPO',
-                              os.path.join(TEST_TMP_PATH, 'vcs-hg'))
+                              os.path.join(TESTS_TMP_PATH, 'vcs-hg'))
 TEST_HG_REPO_CLONE = os.environ.get('VCS_TEST_HG_REPO_CLONE',
-                                    os.path.join(TEST_TMP_PATH, 'vcs-hg-clone'))
+                                    os.path.join(TESTS_TMP_PATH, 'vcs-hg-clone'))
 TEST_HG_REPO_PULL = os.environ.get('VCS_TEST_HG_REPO_PULL',
-                                   os.path.join(TEST_TMP_PATH, 'vcs-hg-pull'))
+                                   os.path.join(TESTS_TMP_PATH, 'vcs-hg-pull'))
 TEST_REPO_PREFIX = 'vcs-test'
 def get_new_dir(title=None):
     """
-    Calculates a path for a new, non-existant, unique sub-directory in TEST_TMP_PATH.
+    Calculates a path for a new, non-existant, unique sub-directory in TESTS_TMP_PATH.
     Resulting directory name will have format:
     prefix-[title-]hexuuid
     Prefix is equal to value of variable TEST_REPO_PREFIX. The "hexuuid" is a
@@ @@ -61,24 +60,24 @@ def get_new_dir(title=None): @@
     if title:
         name = "%s-%s" % (TEST_REPO_PREFIX, title)
     else:
         name = TEST_REPO_PREFIX
-    path = os.path.join(TEST_TMP_PATH, name)
+    path = os.path.join(TESTS_TMP_PATH, name)
     # Generate new hexes until we get a unique name (just in case).
     hex_uuid = uuid.uuid4().hex
     while os.path.exists("%s-%s" % (path, hex_uuid)):
         hex_uuid = uuid.uuid4().hex
     return "%s-%s" % (path, hex_uuid)
 PACKAGE_DIR = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..'))
-_dest = os.path.join(TEST_TMP_PATH, 'aconfig')
+_dest = os.path.join(TESTS_TMP_PATH, 'aconfig')
 shutil.copy(os.path.join(THIS, 'aconfig'), _dest)
 TEST_USER_CONFIG_FILE = _dest
 # overide default configurations with kallithea ones
 from kallithea.tests.base import *

kallithea/tests/vcs/test_archives.py

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ import tarfile @@
 import zipfile
 import datetime
 import tempfile
 import StringIO
 from kallithea.tests.vcs.base import _BackendTestMixin
-from kallithea.tests.vcs.conf import SCM_TESTS, TEST_TMP_PATH
+from kallithea.tests.vcs.conf import SCM_TESTS, TESTS_TMP_PATH
 from kallithea.lib.vcs.exceptions import VCSError
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.lib.vcs.utils.compat import unittest
 class ArchivesTestCaseMixin(_BackendTestMixin):
@@ @@ -26,13 +26,13 @@ class ArchivesTestCaseMixin(_BackendTest @@
                     FileNode('%d/file_%d.txt' % (x, x),
                         content='Foobar %d' % x),
                 ],
+            }
     def test_archive_zip(self):
-        path = tempfile.mkstemp(dir=TEST_TMP_PATH, prefix='test_archive_zip-')[1]
+        path = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_zip-')[1]
         with open(path, 'wb') as f:
             self.tip.fill_archive(stream=f, kind='zip', prefix='repo')
         out = zipfile.ZipFile(path)
         for x in xrange(5):
             node_path = '%d/file_%d.txt' % (x, x)
@@ @@ -40,43 +40,43 @@ class ArchivesTestCaseMixin(_BackendTest @@
             decompressed.write(out.read('repo/' + node_path))
             self.assertEqual(
                 decompressed.getvalue(),
                 self.tip.get_node(node_path).content)
     def test_archive_tgz(self):
-        path = tempfile.mkstemp(dir=TEST_TMP_PATH, prefix='test_archive_tgz-')[1]
+        path = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_tgz-')[1]
         with open(path, 'wb') as f:
             self.tip.fill_archive(stream=f, kind='tgz', prefix='repo')
-        outdir = tempfile.mkdtemp(dir=TEST_TMP_PATH, prefix='test_archive_tgz-', suffix='-outdir')
+        outdir = tempfile.mkdtemp(dir=TESTS_TMP_PATH, prefix='test_archive_tgz-', suffix='-outdir')
         outfile = tarfile.open(path, 'r|gz')
         outfile.extractall(outdir)
         for x in xrange(5):
             node_path = '%d/file_%d.txt' % (x, x)
             self.assertEqual(
                 open(os.path.join(outdir, 'repo/' + node_path)).read(),
                 self.tip.get_node(node_path).content)
     def test_archive_tbz2(self):
-        path = tempfile.mkstemp(dir=TEST_TMP_PATH, prefix='test_archive_tbz2-')[1]
+        path = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_tbz2-')[1]
         with open(path, 'w+b') as f:
             self.tip.fill_archive(stream=f, kind='tbz2', prefix='repo')
-        outdir = tempfile.mkdtemp(dir=TEST_TMP_PATH, prefix='test_archive_tbz2-', suffix='-outdir')
+        outdir = tempfile.mkdtemp(dir=TESTS_TMP_PATH, prefix='test_archive_tbz2-', suffix='-outdir')
         outfile = tarfile.open(path, 'r|bz2')
         outfile.extractall(outdir)
         for x in xrange(5):
             node_path = '%d/file_%d.txt' % (x, x)
             self.assertEqual(
                 open(os.path.join(outdir, 'repo/' + node_path)).read(),
                 self.tip.get_node(node_path).content)
     def test_archive_default_stream(self):
-        tmppath = tempfile.mkstemp(dir=TEST_TMP_PATH, prefix='test_archive_default_stream-')[1]
+        tmppath = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_default_stream-')[1]
         with open(tmppath, 'wb') as stream:
             self.tip.fill_archive(stream=stream)
         mystream = StringIO.StringIO()
         self.tip.fill_archive(stream=mystream)
         mystream.seek(0)
         with open(tmppath, 'rb') as f:

kallithea/tests/vcs/test_git.py

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ import pytest @@
 from kallithea.lib.vcs.backends.git import GitRepository, GitChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError, NodeDoesNotExistError
 from kallithea.lib.vcs.nodes import NodeKind, FileNode, DirNode, NodeState
 from kallithea.lib.vcs.utils.compat import unittest
 from kallithea.model.scm import ScmModel
 from kallithea.tests.vcs.base import _BackendTestMixin
-from kallithea.tests.vcs.conf import TEST_GIT_REPO, TEST_GIT_REPO_CLONE, TEST_TMP_PATH, get_new_dir
+from kallithea.tests.vcs.conf import TEST_GIT_REPO, TEST_GIT_REPO_CLONE, TESTS_TMP_PATH, get_new_dir
 class GitRepositoryTest(unittest.TestCase):
     def __check_for_existing_repo(self):
         if os.path.exists(TEST_GIT_REPO_CLONE):
@@ @@ -24,13 +24,13 @@ class GitRepositoryTest(unittest.TestCas @@
                       % TEST_GIT_REPO_CLONE)
     def setUp(self):
         self.repo = GitRepository(TEST_GIT_REPO)
     def test_wrong_repo_path(self):
-        wrong_repo_path = os.path.join(TEST_TMP_PATH, 'errorrepo')
+        wrong_repo_path = os.path.join(TESTS_TMP_PATH, 'errorrepo')
         self.assertRaises(RepositoryError, GitRepository, wrong_repo_path)
     def test_git_cmd_injection(self):
         repo_inject_path = TEST_GIT_REPO + '; echo "Cake";'
         with self.assertRaises(urllib2.URLError):
             # Should fail because URL will contain the parts after ; too

kallithea/tests/vcs/test_hg.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ import pytest @@
 from kallithea.lib.utils2 import safe_str
 from kallithea.lib.vcs.backends.hg import MercurialRepository, MercurialChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError, NodeDoesNotExistError
 from kallithea.lib.vcs.nodes import NodeKind, NodeState
 from kallithea.tests.vcs.conf import TEST_HG_REPO, TEST_HG_REPO_CLONE, \
-    TEST_HG_REPO_PULL, TEST_TMP_PATH
+    TEST_HG_REPO_PULL, TESTS_TMP_PATH
 from kallithea.lib.vcs.utils.compat import unittest
 class MercurialRepositoryTest(unittest.TestCase):
     def __check_for_existing_repo(self):
@@ @@ -20,13 +20,13 @@ class MercurialRepositoryTest(unittest.T @@
                       % TEST_HG_REPO_CLONE)
     def setUp(self):
         self.repo = MercurialRepository(safe_str(TEST_HG_REPO))
     def test_wrong_repo_path(self):
-        wrong_repo_path = os.path.join(TEST_TMP_PATH, 'errorrepo')
+        wrong_repo_path = os.path.join(TESTS_TMP_PATH, 'errorrepo')
         self.assertRaises(RepositoryError, MercurialRepository, wrong_repo_path)
     def test_unicode_path_repo(self):
         self.assertRaises(VCSError, lambda: MercurialRepository(u'iShouldFail'))
     def test_repo_clone(self):

kallithea/tests/vcs/test_utils.py

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ from kallithea.lib.vcs.utils.helpers imp @@
 from kallithea.lib.vcs.utils.helpers import parse_changesets
 from kallithea.lib.vcs.utils.helpers import parse_datetime
 from kallithea.lib.vcs.utils import author_email, author_name
 from kallithea.lib.vcs.utils.paths import get_user_home
 from kallithea.lib.vcs.exceptions import VCSError
-from kallithea.tests.vcs.conf import TEST_HG_REPO, TEST_GIT_REPO, TEST_TMP_PATH
+from kallithea.tests.vcs.conf import TEST_HG_REPO, TEST_GIT_REPO, TESTS_TMP_PATH
 class PathsTest(unittest.TestCase):
     def _test_get_dirs_for_path(self, path, expected):
         """
@@ @@ -45,25 +45,25 @@ class PathsTest(unittest.TestCase): @@
     def test_get_scm(self):
         self.assertEqual(('hg', TEST_HG_REPO), get_scm(TEST_HG_REPO))
         self.assertEqual(('git', TEST_GIT_REPO), get_scm(TEST_GIT_REPO))
     def test_get_two_scms_for_path(self):
-        multialias_repo_path = os.path.join(TEST_TMP_PATH, 'hg-git-repo-2')
+        multialias_repo_path = os.path.join(TESTS_TMP_PATH, 'hg-git-repo-2')
         if os.path.isdir(multialias_repo_path):
             shutil.rmtree(multialias_repo_path)
         os.mkdir(multialias_repo_path)
         self.assertRaises(VCSError, get_scm, multialias_repo_path)
     def test_get_scm_error_path(self):
         self.assertRaises(VCSError, get_scm, 'err')
     def test_get_scms_for_path(self):
-        new = os.path.join(TEST_TMP_PATH, 'vcs-scms-for-path-%s' % time.time())
+        new = os.path.join(TESTS_TMP_PATH, 'vcs-scms-for-path-%s' % time.time())
         os.mkdir(new)
         self.assertEqual(get_scms_for_path(new), [])
         os.mkdir(os.path.join(new, '.tux'))
         self.assertEqual(get_scms_for_path(new), [])

kallithea/tests/vcs/test_vcs.py

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ import os @@
 import shutil
 from kallithea.lib.utils2 import safe_str
 from kallithea.lib.vcs import VCSError, get_repo, get_backend
 from kallithea.lib.vcs.backends.hg import MercurialRepository
 from kallithea.lib.vcs.utils.compat import unittest
-from kallithea.tests.vcs.conf import TEST_HG_REPO, TEST_GIT_REPO, TEST_TMP_PATH
+from kallithea.tests.vcs.conf import TEST_HG_REPO, TEST_GIT_REPO, TESTS_TMP_PATH
 class VCSTest(unittest.TestCase):
     """
     Tests for main module's methods.
     """
@@ @@ -60,22 +60,22 @@ class VCSTest(unittest.TestCase): @@
         repo = backend(safe_str(path))
         self.assertEqual(repo.__class__, get_repo(safe_str(path)).__class__)
         self.assertEqual(repo.path, get_repo(safe_str(path)).path)
     def test_get_repo_err(self):
-        blank_repo_path = os.path.join(TEST_TMP_PATH, 'blank-error-repo')
+        blank_repo_path = os.path.join(TESTS_TMP_PATH, 'blank-error-repo')
         if os.path.isdir(blank_repo_path):
             shutil.rmtree(blank_repo_path)
         os.mkdir(blank_repo_path)
         self.assertRaises(VCSError, get_repo, blank_repo_path)
         self.assertRaises(VCSError, get_repo, blank_repo_path + 'non_existing')
     def test_get_repo_multialias(self):
-        multialias_repo_path = os.path.join(TEST_TMP_PATH, 'hg-git-repo')
+        multialias_repo_path = os.path.join(TESTS_TMP_PATH, 'hg-git-repo')
         if os.path.isdir(multialias_repo_path):
             shutil.rmtree(multialias_repo_path)
         os.mkdir(multialias_repo_path)
         os.mkdir(os.path.join(multialias_repo_path, '.git'))

0 comments (0 inline, 0 general)