# HG changeset patch # User domruf # Date 2018-03-05 21:13:20 # Node ID 335241410ee618b67dc93b05e93c650bfa4d0c0e # Parent 6ae76150acbd02ac9df39e23335c538dbf3eb291 tests: change vcs repo name strings to unicode This fixes sqlalchemy warnings like SAWarning: Unicode type received non-unicode bind param value 'vcs_test_git_forkSeWYRg'. diff --git a/kallithea/tests/other/test_vcs_operations.py b/kallithea/tests/other/test_vcs_operations.py --- a/kallithea/tests/other/test_vcs_operations.py +++ b/kallithea/tests/other/test_vcs_operations.py @@ -199,9 +199,9 @@ class TestVCSOperations(TestController): @pytest.fixture(scope="module") def testfork(self): # create fork so the repo stays untouched - git_fork_name = '%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) + git_fork_name = u'%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) fixture.create_fork(GIT_REPO, git_fork_name) - hg_fork_name = '%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) + hg_fork_name = u'%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) fixture.create_fork(HG_REPO, hg_fork_name) return {'git': git_fork_name, 'hg': hg_fork_name} @@ -258,7 +258,7 @@ class TestVCSOperations(TestController): clone_url = webserver.repo_url(HG_REPO) stdout, stderr = Command(TESTS_TMP_PATH).execute('hg clone', clone_url, dest_dir) - fork_name = '%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) + fork_name = u'%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) fixture.create_fork(HG_REPO, fork_name) clone_url = webserver.repo_url(fork_name) stdout, stderr = _add_files_and_push(webserver, 'hg', dest_dir, clone_url=clone_url) @@ -273,7 +273,7 @@ class TestVCSOperations(TestController): stdout, stderr = Command(TESTS_TMP_PATH).execute('git clone', clone_url, dest_dir) # commit some stuff into this repo - fork_name = '%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) + fork_name = u'%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) fixture.create_fork(GIT_REPO, fork_name) clone_url = webserver.repo_url(fork_name) stdout, stderr = _add_files_and_push(webserver, 'git', dest_dir, clone_url=clone_url) @@ -294,7 +294,7 @@ class TestVCSOperations(TestController): clone_url = webserver.repo_url(HG_REPO) stdout, stderr = Command(TESTS_TMP_PATH).execute('hg clone', clone_url, dest_dir) - fork_name = '%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) + fork_name = u'%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) fixture.create_fork(HG_REPO, fork_name) clone_url = webserver.repo_url(fork_name) stdout, stderr = _add_files_and_push(webserver, 'hg', dest_dir, files_no=1, clone_url=clone_url) @@ -318,7 +318,7 @@ class TestVCSOperations(TestController): stdout, stderr = Command(TESTS_TMP_PATH).execute('git clone', clone_url, dest_dir) # commit some stuff into this repo - fork_name = '%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) + fork_name = u'%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) fixture.create_fork(GIT_REPO, fork_name) clone_url = webserver.repo_url(fork_name) stdout, stderr = _add_files_and_push(webserver, 'git', dest_dir, files_no=1, clone_url=clone_url) @@ -497,7 +497,7 @@ class TestVCSOperations(TestController): def test_push_unlocks_repository_hg(self, webserver): # enable locking - fork_name = '%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) + fork_name = u'%s_fork%s' % (HG_REPO, _RandomNameSequence().next()) fixture.create_fork(HG_REPO, fork_name) r = Repository.get_by_repo_name(fork_name) r.enable_locking = True @@ -523,7 +523,7 @@ class TestVCSOperations(TestController): # TODO: fix me ! somehow during tests hooks don't get called on Git def test_push_unlocks_repository_git(self, webserver): # enable locking - fork_name = '%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) + fork_name = u'%s_fork%s' % (GIT_REPO, _RandomNameSequence().next()) fixture.create_fork(GIT_REPO, fork_name) r = Repository.get_by_repo_name(fork_name) r.enable_locking = True