This repo is brand new!
{% if g.authenticated and g.repo_committer %}
diff --git a/pagure/ui/app.py b/pagure/ui/app.py
index e29f3f7..0a16d69 100644
--- a/pagure/ui/app.py
+++ b/pagure/ui/app.py
@@ -1041,6 +1041,8 @@ def new_project():
else:
ignore_existing_repos = False
+ mirrored_from = form.mirrored_from.data
+
try:
task = pagure.lib.query.new_project(
flask.g.session,
@@ -1055,6 +1057,7 @@ def new_project():
blacklist=pagure_config["BLACKLISTED_PROJECTS"],
allowed_prefix=pagure_config["ALLOWED_PREFIX"],
add_readme=create_readme,
+ mirrored_from=mirrored_from,
userobj=user,
prevent_40_chars=pagure_config.get(
"OLD_VIEW_COMMIT_ENABLED", False
diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index 5009822..f9abf00 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -281,6 +281,85 @@ class PagureFlaskApptests(tests.Modeltests):
pagure.config.config['ENABLE_NEW_PROJECTS'] = True
+ def test_new_project_mirrored_invalid_url(self):
+ """ Test the new_project with a mirrored repo but an invalid URL. """
+
+ user = tests.FakeUser(username='foo')
+ with tests.user_set(self.app.application, user):
+ output = self.app.get('/new/')
+ self.assertEqual(output.status_code, 200)
+
+ csrf_token = self.get_csrf(output=output)
+
+ data = {
+ 'description': 'Project #1',
+ 'name': 'project-1',
+ 'mirrored_from': 'abcd',
+ 'csrf_token': csrf_token,
+ }
+
+ output = self.app.post('/new/', data=data, follow_redirects=True)
+ self.assertEqual(output.status_code, 200)
+ output_text = output.get_data(as_text=True)
+ self.assertIn(
+ '
New project - Pagure', output_text)
+ self.assertIn(
+ 'Invalid input. ', output_text)
+
+ def test_new_project_mirrored_invalid_sshurl(self):
+ """ Test the new_project with a mirrored repo but an invalid
+ SSH-like url.
+ """
+
+ user = tests.FakeUser(username='foo')
+ with tests.user_set(self.app.application, user):
+ output = self.app.get('/new/')
+ self.assertEqual(output.status_code, 200)
+
+ csrf_token = self.get_csrf(output=output)
+
+ data = {
+ 'description': 'Project #1',
+ 'name': 'project-1',
+ 'mirrored_from': 'ssh://git@server.org/foo/bar.git',
+ 'csrf_token': csrf_token,
+ }
+
+ output = self.app.post('/new/', data=data, follow_redirects=True)
+ self.assertEqual(output.status_code, 200)
+ output_text = output.get_data(as_text=True)
+ self.assertIn(
+ '
New project - Pagure', output_text)
+ self.assertIn(
+ 'Invalid input. ', output_text)
+
+ def test_new_project_mirrored_valid_url(self):
+ """ Test the new_project with a mirrored repo with a valid url. """
+
+ user = tests.FakeUser(username='foo')
+ with tests.user_set(self.app.application, user):
+ output = self.app.get('/new/')
+ self.assertEqual(output.status_code, 200)
+
+ csrf_token = self.get_csrf(output=output)
+
+ data = {
+ 'description': 'Project #1',
+ 'name': 'project-1',
+ 'mirrored_from': 'https://example.com/foo/bar.git',
+ 'csrf_token': csrf_token,
+ }
+
+ output = self.app.post('/new/', data=data, follow_redirects=True)
+ self.assertEqual(output.status_code, 200)
+ output_text = output.get_data(as_text=True)
+ self.assertIn(
+ '
Overview - project-1 - Pagure',
+ output_text)
+ self.assertIn(
+ '
This repo is brand new and meant to be mirrored from '
+ 'https://example.com/foo/bar.git !
', output_text)
+
def test_new_project(self):
""" Test the new_project endpoint. """
# Before
diff --git a/tests/test_pagure_lib_git_mirror_project.py b/tests/test_pagure_lib_git_mirror_project.py
new file mode 100644
index 0000000..4540e32
--- /dev/null
+++ b/tests/test_pagure_lib_git_mirror_project.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+
+"""
+ (c) 2018 - Copyright Red Hat Inc
+
+ Authors:
+ Pierre-Yves Chibon
+
+"""
+
+from __future__ import unicode_literals
+
+__requires__ = ['SQLAlchemy >= 0.8']
+
+import pkg_resources
+
+import datetime
+import os
+import shutil
+import sys
+import tempfile
+import time
+import unittest
+
+import pygit2
+import six
+from mock import patch, MagicMock, ANY, call
+
+sys.path.insert(0, os.path.join(os.path.dirname(
+ os.path.abspath(__file__)), '..'))
+
+import pagure.lib.git
+import tests
+
+from pagure.lib.repo import PagureRepo
+
+
+class PagureLibGitMirrorProjecttests(tests.Modeltests):
+ """ Tests for pagure.lib.git.mirror_pull_project """
+
+ maxDiff = None
+
+ def setUp(self):
+ """ Set up the environnment, ran before every tests. """
+ super(PagureLibGitMirrorProjecttests, self).setUp()
+
+ tests.create_projects(self.session)
+ tests.create_projects_git(
+ os.path.join(self.path, "repos"),
+ bare=True
+ )
+
+ # Make the test project mirrored from elsewhere
+ self.project = pagure.lib.query.get_authorized_project(
+ self.session, 'test')
+ self.project.mirrored_from = "https://example.com/foo/bar.git"
+ self.session.add(self.project)
+ self.session.commit()
+
+ @patch('subprocess.Popen')
+ @patch('subprocess.check_output')
+ def test_mirror_pull_project(self, ck_out_mock, popen_mock):
+ """ Test the mirror_pull_project method of pagure.lib.git. """
+
+ tmp = MagicMock()
+ tmp.communicate.return_value = ('', '')
+ popen_mock.return_value = tmp
+ ck_out_mock.return_value = "all good"
+
+ output = pagure.lib.git.mirror_pull_project(
+ self.session,
+ self.project
+ )
+
+ self.assertEqual(
+ popen_mock.call_count,
+ 2
+ )
+
+ calls = [
+ call(
+ [
+ u'git', u'clone', u'--mirror',
+ u'https://example.com/foo/bar.git', u'.'
+ ],
+ cwd=ANY,
+ stderr=-1,
+ stdin=None,
+ stdout=-1
+ ),
+ ANY,
+ ANY,
+ ANY,
+ ANY,
+ call(
+ [u'git', u'remote', u'add', u'local', ANY],
+ cwd=ANY,
+ stderr=-1,
+ stdin=None,
+ stdout=-1
+ ),
+ ANY,
+ ANY,
+ ANY,
+ ANY,
+ ]
+ self.assertEqual(
+ popen_mock.mock_calls,
+ calls
+ )
+
+ ck_out_mock.assert_called_once_with(
+ [u'git', u'push', u'local', u'--mirror'],
+ cwd=ANY,
+ env=ANY,
+ stderr=-2
+ )
+
+
+if __name__ == '__main__':
+ unittest.main(verbosity=2)