Changeset - f2cda217fbc2
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 10 years ago 2016-01-05 16:30:12
madski@unity3d.com
tests: always convert unicode paths to str before passing to vcs layer

Repo names are generally unicode. Don't rely on implicit conversion.
3 files changed with 26 insertions and 23 deletions:
kallithea/tests/functional/test_admin_repos.py
8
7
kallithea/tests/vcs/test_hg.py
6
5
kallithea/tests/vcs/test_vcs.py
12
11
0 comments (0 inline, 0 general)
kallithea/tests/functional/test_admin_repos.py
➞
Show inline comments
 
@@ -5,6 +5,7 @@ import mock
 
import urllib
 

			




	
	
	
		
 
from kallithea.lib import vcs

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_str

			




	
	
	
		
 
from kallithea.model.db import Repository, RepoGroup, UserRepoToPerm, User, \

			




	
	
	
		
 
    Permission

			




	
	
	
		
 
from kallithea.model.user import UserModel

			




	
	
		
 
@@ -79,7 +80,7 @@ class _BaseTest(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # test if the repository was created on filesystem

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name))

			




	
	
	
		
 
            vcs.get_repo(safe_str(os.path.join(TESTS_TMP_PATH, repo_name)))

			




	
	
	
		
 
        except vcs.exceptions.VCSError:

			




	
	
	
		
 
            self.fail('no repo %s in filesystem' % repo_name)

			




	
	
	
		
 

			




	
	
		
 
@@ -119,7 +120,7 @@ class _BaseTest(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # test if the repository was created on filesystem

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name))

			




	
	
	
		
 
            vcs.get_repo(safe_str(os.path.join(TESTS_TMP_PATH, repo_name)))

			




	
	
	
		
 
        except vcs.exceptions.VCSError:

			




	
	
	
		
 
            self.fail('no repo %s in filesystem' % repo_name)

			




	
	
	
		
 

			




	
	
		
 
@@ -168,7 +169,7 @@ class _BaseTest(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # test if the repository was created on filesystem

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name_full))

			




	
	
	
		
 
            vcs.get_repo(safe_str(os.path.join(TESTS_TMP_PATH, repo_name_full)))

			




	
	
	
		
 
        except vcs.exceptions.VCSError:

			




	
	
	
		
 
            RepoGroupModel().delete(group_name)

			




	
	
	
		
 
            Session().commit()

			




	
	
		
 
@@ -260,7 +261,7 @@ class _BaseTest(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # test if the repository was created on filesystem

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name_full))

			




	
	
	
		
 
            vcs.get_repo(safe_str(os.path.join(TESTS_TMP_PATH, repo_name_full)))

			




	
	
	
		
 
        except vcs.exceptions.VCSError:

			




	
	
	
		
 
            RepoGroupModel().delete(group_name)

			




	
	
	
		
 
            Session().commit()

			




	
	
		
 
@@ -317,7 +318,7 @@ class _BaseTest(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # test if the repository was created on filesystem

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name_full))

			




	
	
	
		
 
            vcs.get_repo(safe_str(os.path.join(TESTS_TMP_PATH, repo_name_full)))

			




	
	
	
		
 
        except vcs.exceptions.VCSError:

			




	
	
	
		
 
            RepoGroupModel().delete(group_name)

			




	
	
	
		
 
            Session().commit()

			




	
	
		
 
@@ -394,7 +395,7 @@ class _BaseTest(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # test if the repository was created on filesystem

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name))

			




	
	
	
		
 
            vcs.get_repo(safe_str(os.path.join(TESTS_TMP_PATH, repo_name)))

			




	
	
	
		
 
        except vcs.exceptions.VCSError:

			




	
	
	
		
 
            self.fail('no repo %s in filesystem' % repo_name)

			




	
	
	
		
 

			




	
	
		
 
@@ -447,7 +448,7 @@ class _BaseTest(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # test if the repository was created on filesystem

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name))

			




	
	
	
		
 
            vcs.get_repo(safe_str(os.path.join(TESTS_TMP_PATH, repo_name)))

			




	
	
	
		
 
        except vcs.exceptions.VCSError:

			




	
	
	
		
 
            self.fail('no repo %s in filesystem' % repo_name)

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/vcs/test_hg.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 

			




	
	
	
		
 
import os

			




	
	
	
		
 
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

			




	
	
		
 
@@ -24,7 +25,7 @@ class MercurialRepositoryTest(unittest.T

			




	
	
	
		
 
                      % TEST_HG_REPO_CLONE)

			




	
	
	
		
 

			




	
	
	
		
 
    def setUp(self):

			




	
	
	
		
 
        self.repo = MercurialRepository(TEST_HG_REPO)

			




	
	
	
		
 
        self.repo = MercurialRepository(safe_str(TEST_HG_REPO))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_wrong_repo_path(self):

			




	
	
	
		
 
        wrong_repo_path = '/tmp/errorrepo'

			




	
	
		
 
@@ -35,7 +36,7 @@ class MercurialRepositoryTest(unittest.T

			




	
	
	
		
 

			




	
	
	
		
 
    def test_repo_clone(self):

			




	
	
	
		
 
        self.__check_for_existing_repo()

			




	
	
	
		
 
        repo = MercurialRepository(TEST_HG_REPO)

			




	
	
	
		
 
        repo = MercurialRepository(safe_str(TEST_HG_REPO))

			




	
	
	
		
 
        repo_clone = MercurialRepository(TEST_HG_REPO_CLONE,

			




	
	
	
		
 
            src_url=TEST_HG_REPO, update_after_clone=True)

			




	
	
	
		
 
        self.assertEqual(len(repo.revisions), len(repo_clone.revisions))

			




	
	
		
 
@@ -45,7 +46,7 @@ class MercurialRepositoryTest(unittest.T

			




	
	
	
		
 
            self.assertEqual(raw_id, repo_clone.get_changeset(raw_id).raw_id)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_repo_clone_with_update(self):

			




	
	
	
		
 
        repo = MercurialRepository(TEST_HG_REPO)

			




	
	
	
		
 
        repo = MercurialRepository(safe_str(TEST_HG_REPO))

			




	
	
	
		
 
        repo_clone = MercurialRepository(TEST_HG_REPO_CLONE + '_w_update',

			




	
	
	
		
 
            src_url=TEST_HG_REPO, update_after_clone=True)

			




	
	
	
		
 
        self.assertEqual(len(repo.revisions), len(repo_clone.revisions))

			




	
	
		
 
@@ -56,7 +57,7 @@ class MercurialRepositoryTest(unittest.T

			




	
	
	
		
 
                                                    'MANIFEST.in')), True,)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_repo_clone_without_update(self):

			




	
	
	
		
 
        repo = MercurialRepository(TEST_HG_REPO)

			




	
	
	
		
 
        repo = MercurialRepository(safe_str(TEST_HG_REPO))

			




	
	
	
		
 
        repo_clone = MercurialRepository(TEST_HG_REPO_CLONE + '_wo_update',

			




	
	
	
		
 
            src_url=TEST_HG_REPO, update_after_clone=False)

			




	
	
	
		
 
        self.assertEqual(len(repo.revisions), len(repo_clone.revisions))

			




	
	
		
 
@@ -242,7 +243,7 @@ TODO: To be written...

			




	
	
	
		
 
class MercurialChangesetTest(unittest.TestCase):

			




	
	
	
		
 

			




	
	
	
		
 
    def setUp(self):

			




	
	
	
		
 
        self.repo = MercurialRepository(TEST_HG_REPO)

			




	
	
	
		
 
        self.repo = MercurialRepository(safe_str(TEST_HG_REPO))

			




	
	
	
		
 

			




	
	
	
		
 
    def _test_equality(self, changeset):

			




	
	
	
		
 
        revision = changeset.revision

			




        

    


    
    

    

        

                

                    kallithea/tests/vcs/test_vcs.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,6 +2,7 @@

			




	
	
	
		
 
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

			




	
	
		
 
@@ -22,14 +23,14 @@ class VCSTest(unittest.TestCase):

			




	
	
	
		
 
        alias = 'hg'

			




	
	
	
		
 
        path = TEST_HG_REPO

			




	
	
	
		
 
        backend = get_backend(alias)

			




	
	
	
		
 
        repo = backend(path)

			




	
	
	
		
 
        repo = backend(safe_str(path))

			




	
	
	
		
 
        self.assertEqual('hg',repo.alias)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_alias_detect_git(self):

			




	
	
	
		
 
        alias = 'git'

			




	
	
	
		
 
        path = TEST_GIT_REPO

			




	
	
	
		
 
        backend = get_backend(alias)

			




	
	
	
		
 
        repo = backend(path)

			




	
	
	
		
 
        repo = backend(safe_str(path))

			




	
	
	
		
 
        self.assertEqual('git',repo.alias)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_wrong_alias(self):

			




	
	
		
 
@@ -40,28 +41,28 @@ class VCSTest(unittest.TestCase):

			




	
	
	
		
 
        alias = 'hg'

			




	
	
	
		
 
        path = TEST_HG_REPO

			




	
	
	
		
 
        backend = get_backend(alias)

			




	
	
	
		
 
        repo = backend(path)

			




	
	
	
		
 
        repo = backend(safe_str(path))

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(repo.__class__, get_repo(path, alias).__class__)

			




	
	
	
		
 
        self.assertEqual(repo.path, get_repo(path, alias).path)

			




	
	
	
		
 
        self.assertEqual(repo.__class__, get_repo(safe_str(path), alias).__class__)

			




	
	
	
		
 
        self.assertEqual(repo.path, get_repo(safe_str(path), alias).path)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_get_repo_autoalias_hg(self):

			




	
	
	
		
 
        alias = 'hg'

			




	
	
	
		
 
        path = TEST_HG_REPO

			




	
	
	
		
 
        backend = get_backend(alias)

			




	
	
	
		
 
        repo = backend(path)

			




	
	
	
		
 
        repo = backend(safe_str(path))

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(repo.__class__, get_repo(path).__class__)

			




	
	
	
		
 
        self.assertEqual(repo.path, get_repo(path).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_autoalias_git(self):

			




	
	
	
		
 
        alias = 'git'

			




	
	
	
		
 
        path = TEST_GIT_REPO

			




	
	
	
		
 
        backend = get_backend(alias)

			




	
	
	
		
 
        repo = backend(path)

			




	
	
	
		
 
        repo = backend(safe_str(path))

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(repo.__class__, get_repo(path).__class__)

			




	
	
	
		
 
        self.assertEqual(repo.path, get_repo(path).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):

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.