Changeset - 760e65b33a2b
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
domruf - 8 years ago 2018-03-13 23:52:10
dominikruf@gmail.com
tests: use testfork fixture for test_vcs_operations tests

This way only one fork needs to be created.
1 file changed with 26 insertions and 43 deletions:
kallithea/tests/other/test_vcs_operations.py
26
43
0 comments (0 inline, 0 general)
kallithea/tests/other/test_vcs_operations.py
➞
Show inline comments
 
@@ -243,97 +243,87 @@ class TestVCSOperations(TestController):
 
        assert 'not found' in stderr
 

			




	
	
	
		
 
    def test_clone_non_existing_path_hg(self, webserver):

			




	
	
	
		
 
        clone_url = webserver.repo_url('trololo')

			




	
	
	
		
 
        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_non_existing_path_git(self, webserver):

			




	
	
	
		
 
        clone_url = webserver.repo_url('trololo')

			




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

			




	
	
	
		
 
        assert 'not found' in stderr

			




	
	
	
		
 

			




	
	
	
		
 
    def test_push_new_file_hg(self, webserver):

			




	
	
	
		
 
    def test_push_new_file_hg(self, webserver, testfork):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(HG_REPO)

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        fork_name = u'%s_fork%s' % (HG_REPO, _RandomNameSequence().next())

			




	
	
	
		
 
        fixture.create_fork(HG_REPO, fork_name)

			




	
	
	
		
 
        clone_url = webserver.repo_url(fork_name)

			




	
	
	
		
 
        clone_url = webserver.repo_url(testfork['hg'])

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, 'hg', dest_dir, clone_url=clone_url)

			




	
	
	
		
 

			




	
	
	
		
 
        assert 'pushing to' in stdout

			




	
	
	
		
 
        assert 'Repository size' in stdout

			




	
	
	
		
 
        assert 'Last revision is now' in stdout

			




	
	
	
		
 

			




	
	
	
		
 
    def test_push_new_file_git(self, webserver):

			




	
	
	
		
 
    def test_push_new_file_git(self, webserver, testfork):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(GIT_REPO)

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        # commit some stuff into this repo

			




	
	
	
		
 
        fork_name = u'%s_fork%s' % (GIT_REPO, _RandomNameSequence().next())

			




	
	
	
		
 
        fixture.create_fork(GIT_REPO, fork_name)

			




	
	
	
		
 
        clone_url = webserver.repo_url(fork_name)

			




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

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, 'git', dest_dir, clone_url=clone_url)

			




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

			




	
	
	
		
 
        _check_proper_git_push(stdout, stderr)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_push_invalidates_cache_hg(self, webserver):

			




	
	
	
		
 
    def test_push_invalidates_cache_hg(self, webserver, testfork):

			




	
	
	
		
 
        key = CacheInvalidation.query().filter(CacheInvalidation.cache_key

			




	
	
	
		
 
                                               == HG_REPO).scalar()

			




	
	
	
		
 
        if not key:

			




	
	
	
		
 
            key = CacheInvalidation(HG_REPO, HG_REPO)

			




	
	
	
		
 
            Session().add(key)

			




	
	
	
		
 

			




	
	
	
		
 
        key.cache_active = True

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(HG_REPO)

			




	
	
	
		
 
        clone_url = webserver.repo_url(testfork['hg'])

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
	
		
 
        key = CacheInvalidation.query().filter(CacheInvalidation.cache_key

			




	
	
	
		
 
                                               == fork_name).all()

			




	
	
	
		
 
                                               == testfork['hg']).all()

			




	
	
	
		
 
        assert key == []

			




	
	
	
		
 

			




	
	
	
		
 
    def test_push_invalidates_cache_git(self, webserver):

			




	
	
	
		
 
    def test_push_invalidates_cache_git(self, webserver, testfork):

			




	
	
	
		
 
        key = CacheInvalidation.query().filter(CacheInvalidation.cache_key

			




	
	
	
		
 
                                               == GIT_REPO).scalar()

			




	
	
	
		
 
        if not key:

			




	
	
	
		
 
            key = CacheInvalidation(GIT_REPO, GIT_REPO)

			




	
	
	
		
 
            Session().add(key)

			




	
	
	
		
 

			




	
	
	
		
 
        key.cache_active = True

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(GIT_REPO)

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        # commit some stuff into this repo

			




	
	
	
		
 
        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)

			




	
	
	
		
 
        _check_proper_git_push(stdout, stderr)

			




	
	
	
		
 

			




	
	
	
		
 
        key = CacheInvalidation.query().filter(CacheInvalidation.cache_key

			




	
	
	
		
 
                                               == fork_name).all()

			




	
	
	
		
 
                                               == testfork['git']).all()

			




	
	
	
		
 
        assert key == []

			




	
	
	
		
 

			




	
	
	
		
 
    def test_push_wrong_credentials_hg(self, webserver):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(HG_REPO)

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, 'hg', dest_dir, username='bad',

			




	
	
	
		
 
                                             password='name', ignoreReturnCode=True)

			




	
	
	
		
 

			




	
	
	
		
 
        assert 'abort: authorization failed' in stderr

			




	
	
	
		
 

			




	
	
		
 
@@ -485,74 +475,70 @@ class TestVCSOperations(TestController):

			




	
	
	
		
 
                                             ignoreReturnCode=True)

			




	
	
	
		
 
        err = 'Repository `%s` locked by user `%s`' % (GIT_REPO, TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 
        assert err in stderr

			




	
	
	
		
 

			




	
	
	
		
 
        # TODO: fix this somehow later on Git, Git is stupid and even if we throw

			




	
	
	
		
 
        # back 423 to it, it makes ANOTHER request and we fail there with 405 :/

			




	
	
	
		
 

			




	
	
	
		
 
        msg = ("""abort: HTTP Error 423: Repository `%s` locked by user `%s`"""

			




	
	
	
		
 
                % (GIT_REPO, TEST_USER_ADMIN_LOGIN))

			




	
	
	
		
 
        #msg = "405 Method Not Allowed"

			




	
	
	
		
 
        #assert msg in stderr

			




	
	
	
		
 

			




	
	
	
		
 
    def test_push_unlocks_repository_hg(self, webserver):

			




	
	
	
		
 
    def test_push_unlocks_repository_hg(self, webserver, testfork):

			




	
	
	
		
 
        # enable locking

			




	
	
	
		
 
        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 = Repository.get_by_repo_name(testfork['hg'])

			




	
	
	
		
 
        r.enable_locking = True

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        # clone some temp

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(fork_name)

			




	
	
	
		
 
        clone_url = webserver.repo_url(testfork['hg'])

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        # check for lock repo after clone

			




	
	
	
		
 
        r = Repository.get_by_repo_name(fork_name)

			




	
	
	
		
 
        r = Repository.get_by_repo_name(testfork['hg'])

			




	
	
	
		
 
        uid = User.get_by_username(TEST_USER_ADMIN_LOGIN).user_id

			




	
	
	
		
 
        assert r.locked[0] == uid

			




	
	
	
		
 

			




	
	
	
		
 
        # push is ok and repo is now unlocked

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, 'hg', dest_dir, clone_url=clone_url)

			




	
	
	
		
 
        assert str('remote: Released lock on repo `%s`' % fork_name) in stdout

			




	
	
	
		
 
        assert str('remote: Released lock on repo `%s`' % testfork['hg']) in stdout

			




	
	
	
		
 
        # we need to cleanup the Session Here !

			




	
	
	
		
 
        Session.remove()

			




	
	
	
		
 
        r = Repository.get_by_repo_name(fork_name)

			




	
	
	
		
 
        r = Repository.get_by_repo_name(testfork['hg'])

			




	
	
	
		
 
        assert r.locked == [None, None]

			




	
	
	
		
 

			




	
	
	
		
 
    # TODO: fix me ! somehow during tests hooks don't get called on Git

			




	
	
	
		
 
    def test_push_unlocks_repository_git(self, webserver):

			




	
	
	
		
 
    def test_push_unlocks_repository_git(self, webserver, testfork):

			




	
	
	
		
 
        # enable locking

			




	
	
	
		
 
        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 = Repository.get_by_repo_name(testfork['git'])

			




	
	
	
		
 
        r.enable_locking = True

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        # clone some temp

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(fork_name)

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        # check for lock repo after clone

			




	
	
	
		
 
        r = Repository.get_by_repo_name(fork_name)

			




	
	
	
		
 
        r = Repository.get_by_repo_name(testfork['git'])

			




	
	
	
		
 
        assert r.locked[0] == User.get_by_username(TEST_USER_ADMIN_LOGIN).user_id

			




	
	
	
		
 

			




	
	
	
		
 
        # push is ok and repo is now unlocked

			




	
	
	
		
 
        stdout, stderr = _add_files_and_push(webserver, 'git', dest_dir, clone_url=clone_url)

			




	
	
	
		
 
        _check_proper_git_push(stdout, stderr)

			




	
	
	
		
 

			




	
	
	
		
 
        assert ('remote: Released lock on repo `%s`' % fork_name) in stderr

			




	
	
	
		
 
        assert ('remote: Released lock on repo `%s`' % testfork['git']) in stderr

			




	
	
	
		
 
        # we need to cleanup the Session Here !

			




	
	
	
		
 
        Session.remove()

			




	
	
	
		
 
        r = Repository.get_by_repo_name(fork_name)

			




	
	
	
		
 
        r = Repository.get_by_repo_name(testfork['git'])

			




	
	
	
		
 
        assert r.locked == [None, None]

			




	
	
	
		
 

			




	
	
	
		
 
    def test_ip_restriction_hg(self, webserver):

			




	
	
	
		
 
        user_model = UserModel()

			




	
	
	
		
 
        try:

			




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

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            clone_url = webserver.repo_url(HG_REPO)

			




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

			




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

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            # release IP restrictions

			




	
	
		
 
@@ -658,42 +644,39 @@ class TestVCSOperations(TestController):

			




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

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        # re-try to push

			




	
	
	
		
 
        stdout, stderr = Command(dest_dir).execute('%s push' % repo_type, clone_url, ignoreReturnCode=True)

			




	
	
	
		
 
        assert 'passing_test_hook succeeded' in stdout + stderr

			




	
	
	
		
 
        assert 'Traceback' not in stdout + stderr

			




	
	
	
		
 
        assert 'prechangegroup.testhook hook failed' not in stdout + stderr

			




	
	
	
		
 
        # no more outgoing changesets

			




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

			




	
	
	
		
 
        assert stdout == ''

			




	
	
	
		
 
        assert stderr == ''

			




	
	
	
		
 

			




	
	
	
		
 
    def test_add_submodule(self, webserver):

			




	
	
	
		
 
    def test_add_submodule(self, webserver, testfork):

			




	
	
	
		
 
        dest_dir = _get_tmp_dir()

			




	
	
	
		
 
        clone_url = webserver.repo_url(GIT_REPO)

			




	
	
	
		
 

			




	
	
	
		
 
        # GIT_REPO should be untouched for other tests so create a fork

			




	
	
	
		
 
        fork_name = '%s_fork%s' % (GIT_REPO, _RandomNameSequence().next())

			




	
	
	
		
 
        fixture.create_fork(GIT_REPO, fork_name)

			




	
	
	
		
 
        fork_url = webserver.repo_url(fork_name)

			




	
	
	
		
 
        fork_url = webserver.repo_url(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, '"')

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        # check for testsubmodule link in files page

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=fork_name,

			




	
	
	
		
 
                                    repo_name=testfork['git'],

			




	
	
	
		
 
                                    revision='tip',

			




	
	
	
		
 
                                    f_path='/'))

			




	
	
	
		
 
        response.mustcontain('<a class="submodule-dir" href="%s" target="_blank"><i class="icon-file-submodule"></i><span>testsubmodule @ ' % clone_url)

			




	
	
	
		
 

			




	
	
	
		
 
        # check that following a submodule link actually works - and redirects

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=fork_name,

			




	
	
	
		
 
                                    repo_name=testfork['git'],

			




	
	
	
		
 
                                    revision='tip',

			




	
	
	
		
 
                                    f_path='/testsubmodule'),

			




	
	
	
		
 
                                status=302)

			




	
	
	
		
 
        assert response.location == clone_url

			




        

    



    


    



    



      

      





    
    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.