From 72ed6b3f4d9e389338b1939305c6e854bbadf9fd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: Adjust unit-tests for the @repo_method decorator --- diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py index effabc7..05efda1 100644 --- a/tests/test_pagure_flask_internal.py +++ b/tests/test_pagure_flask_internal.py @@ -40,6 +40,7 @@ class PagureFlaskInternaltests(tests.Modeltests): pagure.SESSION = self.session pagure.internal.SESSION = self.session pagure.ui.repo.SESSION = self.session + pagure.ui.filters.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( @@ -815,6 +816,7 @@ class PagureFlaskInternaltests(tests.Modeltests): def test_get_branches_of_commit(self): ''' Test the get_branches_of_commit from the internal API. ''' tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser() user.username = 'pingou' @@ -868,8 +870,17 @@ class PagureFlaskInternaltests(tests.Modeltests): ) # Request is fine, but git repo doesn't exist + item = pagure.lib.model.Project( + user_id=1, # pingou + name='test20', + description='test project #20', + hook_token='aaabbbhhh', + ) + self.session.add(item) + self.session.commit() + data = { - 'repo': 'test', + 'repo': 'test20', 'commit_id': 'foo', 'csrf_token': csrf_token, } @@ -886,9 +897,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a git repo to play with gitrepo = os.path.join(tests.HERE, 'test.git') - self.assertFalse(os.path.exists(gitrepo)) - os.makedirs(gitrepo) - repo = pygit2.init_repository(gitrepo) + self.assertTrue(os.path.exists(gitrepo)) + repo = pygit2.Repository(gitrepo) # Create a file in that git repo with open(os.path.join(gitrepo, 'sources'), 'w') as stream: diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 0c1bda9..42d3886 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -71,6 +71,8 @@ class PagureFlaskRepotests(tests.Modeltests): user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 404) @@ -117,6 +119,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 403) @@ -165,7 +168,6 @@ class PagureFlaskRepotests(tests.Modeltests): 'found', output.data) data['user'] = 'foo' - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/adduser', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -207,6 +209,8 @@ class PagureFlaskRepotests(tests.Modeltests): #just get the csrf token pagure.APP.config['ENABLE_USER_MNGT'] = True tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + output = self.app.get('/test/addgroup') csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -224,7 +228,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) data['group'] = 'foo' - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/addgroup', data=data, follow_redirects=True) self.assertEqual(output.status_code, 404) @@ -246,6 +249,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.get('/test/addgroup') self.assertEqual(output.status_code, 403) @@ -307,7 +311,6 @@ class PagureFlaskRepotests(tests.Modeltests): output.data) data['group'] = 'foo' - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/addgroup', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -331,6 +334,7 @@ class PagureFlaskRepotests(tests.Modeltests): with tests.user_set(pagure.APP, user): tests.create_projects(self.session) tests.create_projects_git(tests.HERE) + output = self.app.post('/test/settings') csrf_token = output.data.split( @@ -379,6 +383,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.post('/test/dropuser/1') self.assertEqual(output.status_code, 403) @@ -390,7 +395,6 @@ class PagureFlaskRepotests(tests.Modeltests): user.username = 'pingou' with tests.user_set(pagure.APP, user): - tests.create_projects_git(tests.HERE) output = self.app.post('/test/settings') csrf_token = output.data.split( @@ -518,6 +522,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.post('/test/dropgroup/1') self.assertEqual(output.status_code, 403) @@ -529,7 +534,6 @@ class PagureFlaskRepotests(tests.Modeltests): user.username = 'pingou' with tests.user_set(pagure.APP, user): - tests.create_projects_git(tests.HERE) output = self.app.post('/test/settings') csrf_token = output.data.split( @@ -2132,18 +2136,21 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + #tests.create_projects_git(tests.HERE) output = self.app.post('/test/delete') # No git repo associated - self.assertEqual(output.status_code, 403) + self.assertEqual(output.status_code, 404) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): + tests.create_projects_git(tests.HERE) + ast.return_value = True output = self.app.post('/test/delete') self.assertEqual(output.status_code, 302) - ast.return_value = False + output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( @@ -2166,6 +2173,7 @@ index 0000000..fb7093d self.session.add(item) self.session.commit() tests.create_projects_git(tests.HERE) + output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertTrue( @@ -2372,6 +2380,7 @@ index 0000000..fb7093d """ Test the new_repo_hook_token endpoint. """ ast.return_value = False tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) repo = pagure.lib.get_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') @@ -2413,7 +2422,6 @@ index 0000000..fb7093d repo = pagure.lib.get_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/hook_token', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200)