Changeset - 7f8fb30891e5
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 7 years ago 2019-01-17 04:25:52
mads@kiilerich.com
Grafted from: 880d9359124b
tests: create clone_url in VcsTest as repo_url_param - it will soon create more than just a URL when it will be used for ssh testing
1 file changed with 24 insertions and 18 deletions:
kallithea/tests/other/test_vcs_operations.py
24
18
0 comments (0 inline, 0 general)
kallithea/tests/other/test_vcs_operations.py
➞
Show inline comments
 
@@ -57,16 +57,22 @@ class HttpVcsTest(object):
 
    def repo_url_param(webserver, repo_name, **kwargs):
 
        return webserver.repo_url(repo_name, **kwargs)
 

			




	
	
	
		
 
class HgVcsTest(object):

			




	
	
	
		
 
    repo_type = 'hg'

			




	
	
	
		
 
    repo_name = HG_REPO

			




	
	
	
		
 
    @staticmethod

			




	
	
	
		
 
    def repo_url_param(webserver, repo_name, **kwargs):

			




	
	
	
		
 
        return webserver.repo_url(repo_name, **kwargs)

			




	
	
	
		
 

			




	
	
	
		
 
class GitVcsTest(object):

			




	
	
	
		
 
    repo_type = 'git'

			




	
	
	
		
 
    repo_name = GIT_REPO

			




	
	
	
		
 
    @staticmethod

			




	
	
	
		
 
    def repo_url_param(webserver, repo_name, **kwargs):

			




	
	
	
		
 
        return webserver.repo_url(repo_name, **kwargs)

			




	
	
	
		
 

			




	
	
	
		
 
class HgHttpVcsTest(HgVcsTest, HttpVcsTest):

			




	
	
	
		
 
    pass

			




	
	
	
		
 

			




	
	
	
		
 
class GitHttpVcsTest(GitVcsTest, HttpVcsTest):

			




	
	
	
		
 
    pass

			




	
	
		
 
@@ -217,13 +223,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
        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}

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize_vcs_test

			




	
	
	
		
 
    def test_clone_repo_by_admin(self, webserver, vt):

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, vt.repo_name)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, _get_tmp_dir())

			




	
	
	
		
 

			




	
	
	
		
 
        if vt.repo_type == 'git':

			




	
	
	
		
 
            assert 'Cloning into' in stdout + stderr

			




	
	
	
		
 
            assert stderr == '' or stdout == ''

			




	
	
	
		
 
        elif vt.repo_type == 'hg':

			




	
	
		
 
@@ -232,32 +238,32 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
            assert 'adding manifests' in stdout

			




	
	
	
		
 
            assert 'adding file changes' in stdout

			




	
	
	
		
 
            assert stderr == ''

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize_vcs_test_http

			




	
	
	
		
 
    def test_clone_wrong_credentials(self, webserver, vt):

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name, password='bad!')

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, vt.repo_name, password='bad!')

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, _get_tmp_dir(), ignoreReturnCode=True)

			




	
	
	
		
 
        if vt.repo_type == 'git':

			




	
	
	
		
 
            assert 'fatal: Authentication failed' in stderr

			




	
	
	
		
 
        elif vt.repo_type == 'hg':

			




	
	
	
		
 
            assert 'abort: authorization failed' in stderr

			




	
	
	
		
 

			




	
	
	
		
 
    def test_clone_git_dir_as_hg(self, webserver):

			




	
	
	
		
 
        clone_url = webserver.repo_url(GIT_REPO)

			




	
	
	
		
 
        clone_url = HgHttpVcsTest.repo_url_param(webserver, GIT_REPO)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute('hg clone', clone_url, _get_tmp_dir(), ignoreReturnCode=True)

			




	
	
	
		
 
        assert 'HTTP Error 404: Not Found' in stderr

			




	
	
	
		
 

			




	
	
	
		
 
    def test_clone_hg_repo_as_git(self, webserver):

			




	
	
	
		
 
        clone_url = webserver.repo_url(HG_REPO)

			




	
	
	
		
 
        clone_url = GitHttpVcsTest.repo_url_param(webserver, HG_REPO)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute('git clone', clone_url, _get_tmp_dir(), ignoreReturnCode=True)

			




	
	
	
		
 
        assert 'not found' in stderr

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize_vcs_test

			




	
	
	
		
 
    def test_clone_non_existing_path(self, webserver, vt):

			




	
	
	
		
 
        clone_url = webserver.repo_url('trololo')

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, 'trololo')

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, _get_tmp_dir(), ignoreReturnCode=True)

			




	
	
	
		
 
        if vt.repo_type == 'git':

			




	
	
	
		
 
            assert 'not found' in stderr

			




	
	
	
		
 
        elif vt.repo_type == 'hg':

			




	
	
	
		
 
            assert 'HTTP Error 404: Not Found' in stderr

			




	
	
	
		
 

			




	
	
		
 
@@ -287,13 +293,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
        # Expect something like:

			




	
	
	
		
 
        # {u'result': {u'msg': u'Created new repository `new_git_XXX`', u'task': None, u'success': True}, u'id': 7, u'error': None}

			




	
	
	
		
 
        assert result[u'result'][u'success']

			




	
	
	
		
 

			




	
	
	
		
 
        # Create local clone of the empty server repo

			




	
	
	
		
 
        local_clone_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(repo_name)

			




	
	
	
		
 
        clone_url = GitHttpVcsTest.repo_url_param(webserver, repo_name)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute('git clone', clone_url, local_clone_dir, ignoreReturnCode=True)

			




	
	
	
		
 

			




	
	
	
		
 
        # Make 3 commits and push to the empty server repo.

			




	
	
	
		
 
        # The server repo doesn't have any other heads than the

			




	
	
	
		
 
        # refs/heads/master we are pushing, but the `git log` in the push hook

			




	
	
	
		
 
        # should still list the 3 commits.

			




	
	
		
 
@@ -313,16 +319,16 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
        assert uls[3].action.startswith(u'push:')

			




	
	
	
		
 
        assert uls[3].action.count(',') == 2 # expect 3 commits

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize_vcs_test

			




	
	
	
		
 
    def test_push_new_file(self, webserver, testfork, vt):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, vt.repo_name)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, dest_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        clone_url = webserver.repo_url(testfork[vt.repo_type])

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, testfork[vt.repo_type])

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, vt, dest_dir, clone_url=clone_url)

			




	
	
	
		
 

			




	
	
	
		
 
        if vt.repo_type == 'git':

			




	
	
	
		
 
            print [(x.repo_full_path, x.repo_path) for x in Repository.query()]  # TODO: what is this for

			




	
	
	
		
 
            _check_proper_git_push(stdout, stderr)

			




	
	
	
		
 
        elif vt.repo_type == 'hg':

			




	
	
		
 
@@ -339,13 +345,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
            Session().add(key)

			




	
	
	
		
 

			




	
	
	
		
 
        key.cache_active = True

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(testfork[vt.repo_type])

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, testfork[vt.repo_type])

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, dest_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, vt, dest_dir, files_no=1, clone_url=clone_url)

			




	
	
	
		
 

			




	
	
	
		
 
        if vt.repo_type == 'git':

			




	
	
	
		
 
            _check_proper_git_push(stdout, stderr)

			




	
	
		
 
@@ -353,13 +359,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
                                               == testfork[vt.repo_type]).all()

			




	
	
	
		
 
        assert key == []

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize_vcs_test_http

			




	
	
	
		
 
    def test_push_wrong_credentials(self, webserver, vt):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, vt.repo_name)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, dest_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name, username='bad', password='name')

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, vt, dest_dir,

			




	
	
	
		
 
                                             clone_url=clone_url, ignoreReturnCode=True)

			




	
	
	
		
 

			




	
	
		
 
@@ -368,26 +374,26 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
        elif vt.repo_type == 'hg':

			




	
	
	
		
 
            assert 'abort: authorization failed' in stderr

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize_vcs_test

			




	
	
	
		
 
    def test_push_with_readonly_credentials(self, webserver, vt):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name, username=TEST_USER_REGULAR_LOGIN, password=TEST_USER_REGULAR_PASS)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, vt.repo_name, username=TEST_USER_REGULAR_LOGIN, password=TEST_USER_REGULAR_PASS)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, dest_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, vt, dest_dir, ignoreReturnCode=True, clone_url=clone_url)

			




	
	
	
		
 

			




	
	
	
		
 
        if vt.repo_type == 'git':

			




	
	
	
		
 
            assert 'The requested URL returned error: 403' in stderr

			




	
	
	
		
 
        elif vt.repo_type == 'hg':

			




	
	
	
		
 
            assert 'abort: HTTP Error 403: Forbidden' in stderr

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize_vcs_test

			




	
	
	
		
 
    def test_push_back_to_wrong_url(self, webserver, vt):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, vt.repo_name)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, dest_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(

			




	
	
	
		
 
            webserver, vt, dest_dir, clone_url='http://%s:%s/tmp' % (

			




	
	
	
		
 
                webserver.server_address[0], webserver.server_address[1]),

			




	
	
	
		
 
            ignoreReturnCode=True)

			




	
	
		
 
@@ -403,13 +409,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            # Add IP constraint that excludes the test context:

			




	
	
	
		
 
            user_model.add_extra_ip(TEST_USER_ADMIN_LOGIN, '10.10.10.10/32')

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            # IP permissions are cached, need to wait for the cache in the server process to expire

			




	
	
	
		
 
            time.sleep(1.5)

			




	
	
	
		
 
            clone_url = webserver.repo_url(vt.repo_name)

			




	
	
	
		
 
            clone_url = vt.repo_url_param(webserver, vt.repo_name)

			




	
	
	
		
 
            stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, _get_tmp_dir(), ignoreReturnCode=True)

			




	
	
	
		
 
            if vt.repo_type == 'git':

			




	
	
	
		
 
                # The message apparently changed in Git 1.8.3, so match it loosely.

			




	
	
	
		
 
                assert re.search(r'\b403\b', stderr)

			




	
	
	
		
 
            elif vt.repo_type == 'hg':

			




	
	
	
		
 
                assert 'abort: HTTP Error 403: Forbidden' in stderr

			




	
	
		
 
@@ -418,13 +424,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
            for ip in UserIpMap.query():

			




	
	
	
		
 
                UserIpMap.delete(ip.ip_id)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            # IP permissions are cached, need to wait for the cache in the server process to expire

			




	
	
	
		
 
            time.sleep(1.5)

			




	
	
	
		
 

			




	
	
	
		
 
        clone_url = webserver.repo_url(vt.repo_name)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, vt.repo_name)

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, _get_tmp_dir())

			




	
	
	
		
 

			




	
	
	
		
 
        if vt.repo_type == 'git':

			




	
	
	
		
 
            assert 'Cloning into' in stdout + stderr

			




	
	
	
		
 
            assert stderr == '' or stdout == ''

			




	
	
	
		
 
        elif vt.repo_type == 'hg':

			




	
	
		
 
@@ -438,13 +444,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
    @parametrize_vcs_test_hg # git hooks doesn't work like hg hooks

			




	
	
	
		
 
    def test_custom_hooks_preoutgoing(self, testhook_cleanup, webserver, testfork, vt):

			




	
	
	
		
 
        # set prechangegroup to failing hook (returns True)

			




	
	
	
		
 
        Ui.create_or_update_hook('preoutgoing.testhook', 'python:kallithea.tests.fixture.failing_test_hook')

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        # clone repo

			




	
	
	
		
 
        clone_url = webserver.repo_url(testfork[vt.repo_type], username=TEST_USER_ADMIN_LOGIN, password=TEST_USER_ADMIN_PASS)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, testfork[vt.repo_type], username=TEST_USER_ADMIN_LOGIN, password=TEST_USER_ADMIN_PASS)

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH) \

			




	
	
	
		
 
            .execute(vt.repo_type, 'clone', clone_url, dest_dir, ignoreReturnCode=True)

			




	
	
	
		
 
        if vt.repo_type == 'hg':

			




	
	
	
		
 
            assert 'preoutgoing.testhook hook failed' in stdout

			




	
	
	
		
 
        elif vt.repo_type == 'git':

			




	
	
		
 
@@ -453,13 +459,13 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
    @parametrize_vcs_test_hg # git hooks doesn't work like hg hooks

			




	
	
	
		
 
    def test_custom_hooks_prechangegroup(self, testhook_cleanup, webserver, testfork, vt):

			




	
	
	
		
 
        # set prechangegroup to failing hook (returns True)

			




	
	
	
		
 
        Ui.create_or_update_hook('prechangegroup.testhook', 'python:kallithea.tests.fixture.failing_test_hook')

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        # clone repo

			




	
	
	
		
 
        clone_url = webserver.repo_url(testfork[vt.repo_type], username=TEST_USER_ADMIN_LOGIN, password=TEST_USER_ADMIN_PASS)

			




	
	
	
		
 
        clone_url = vt.repo_url_param(webserver, testfork[vt.repo_type], username=TEST_USER_ADMIN_LOGIN, password=TEST_USER_ADMIN_PASS)

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute(vt.repo_type, 'clone', clone_url, dest_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, vt, dest_dir, clone_url,

			




	
	
	
		
 
                                             ignoreReturnCode=True)

			




	
	
	
		
 
        assert 'failing_test_hook failed' in stdout + stderr

			




	
	
		
 
@@ -495,15 +501,15 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
        stdout, stderr = _check_outgoing(vt.repo_type, dest_dir, clone_url)

			




	
	
	
		
 
        assert stdout == ''

			




	
	
	
		
 
        assert stderr == ''

			




	
	
	
		
 

			




	
	
	
		
 
    def test_add_submodule_git(self, webserver, testfork):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(GIT_REPO)

			




	
	
	
		
 
        clone_url = GitHttpVcsTest.repo_url_param(webserver, GIT_REPO)

			




	
	
	
		
 

			




	
	
	
		
 
        fork_url = webserver.repo_url(testfork['git'])

			




	
	
	
		
 
        fork_url = GitHttpVcsTest.repo_url_param(webserver, testfork['git'])

			




	
	
	
		
 

			




	
	
	
		
 
        # add submodule

			




	
	
	
		
 
        stdout, stderr = Command(TESTS_TMP_PATH).execute('git clone', fork_url, dest_dir)

			




	
	
	
		
 
        stdout, stderr = Command(dest_dir).execute('git submodule add', clone_url, 'testsubmodule')

			




	
	
	
		
 
        stdout, stderr = Command(dest_dir).execute('git commit -am "added testsubmodule pointing to', clone_url, '"', EMAIL=TEST_USER_ADMIN_EMAIL)

			




	
	
	
		
 
        stdout, stderr = Command(dest_dir).execute('git push', fork_url, 'master')

			




        

    



    


    



    



      

      





    
    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.