# HG changeset patch # User Mads Kiilerich # Date 2015-04-28 16:55:05 # Node ID 790da8154ef849b4d8d8256ba20edcfc5d7b5035 # Parent fc71103e16b7496758098d04485077866c42ea0e tests: minimize the amount of references to rc and the past diff --git a/kallithea/tests/fixtures/journal_dump.csv b/kallithea/tests/fixtures/journal_dump.csv --- a/kallithea/tests/fixtures/journal_dump.csv +++ b/kallithea/tests/fixtures/journal_dump.csv @@ -1782,9 +1782,9 @@ user_log_id,user_id,username,repository_ 1846,3,demo,99,another-fork-to-check-code-review,"",user_commented_revision:fba17a64fa4978bfea19222da5e64a18cfddeecd,2012-11-06 04:15:29.032768 1847,3,demo,68,aaa-project,"",user_commented_revision:0c33fa58efc5a5541d8d3f1a3d3b77367e3d94f5,2012-11-06 04:17:16.091927 1848,3,demo,249,abcdefg,"",user_commented_revision:5d80e28538141e322b317168e2367fb03178d58c,2012-11-06 06:10:53.372505 -1849,3,demo,362,Marcin,"",started_following_repo,2012-11-06 10:45:38.505485 -1850,3,demo,362,Marcin,"",user_created_repo,2012-11-06 10:45:38.518969 -1851,3,demo,362,hidden/Marcin,"",user_updated_repo,2012-11-06 10:45:46.281581 +1849,3,demo,362,Username,"",started_following_repo,2012-11-06 10:45:38.505485 +1850,3,demo,362,Username,"",user_created_repo,2012-11-06 10:45:38.518969 +1851,3,demo,362,hidden/Username,"",user_updated_repo,2012-11-06 10:45:46.281581 1852,3,demo,177,blah,62.200.22.2,push:b369fb18c8d61fe0d3b14c417466680230cabe46,2012-11-06 10:47:55.655029 1853,3,demo,99,another-fork-to-check-code-review,"",user_commented_revision:d5422faf648cc589425cd3b0dbf1f6dbf93036a0,2012-11-06 13:12:05.517155 1854,3,demo,38,code-review-test,"",user_commented_revision:6d7db5794e8cad7da042b6ae6238116c6e59a4d2,2012-11-06 16:12:59.38977 diff --git a/kallithea/tests/functional/test_login.py b/kallithea/tests/functional/test_login.py --- a/kallithea/tests/functional/test_login.py +++ b/kallithea/tests/functional/test_login.py @@ -208,7 +208,7 @@ class TestLoginController(TestController def test_register_ok(self): username = 'test_regular4' password = 'qweqwe' - email = 'marcin@test.com' + email = 'username@test.com' name = 'testname' lastname = 'testlastname' @@ -233,7 +233,7 @@ class TestLoginController(TestController self.assertEqual(ret.admin, False) def test_forgot_password_wrong_mail(self): - bad_email = 'marcin@wrongmail.org' + bad_email = 'username@wrongmail.org' response = self.app.post( url(controller='login', action='password_reset'), {'email': bad_email, } @@ -250,7 +250,7 @@ class TestLoginController(TestController username = 'test_password_reset_1' password = 'qweqwe' - email = 'marcin@python-works.com' + email = 'username@python-works.com' name = 'passwd' lastname = 'reset' diff --git a/kallithea/tests/other/manual_test_vcs_operations.py b/kallithea/tests/other/manual_test_vcs_operations.py --- a/kallithea/tests/other/manual_test_vcs_operations.py +++ b/kallithea/tests/other/manual_test_vcs_operations.py @@ -111,7 +111,7 @@ def _add_files_and_push(vcs, DEST, **kwa for i in xrange(kwargs.get('files_no', 3)): cmd = """echo 'added_line%s' >> %s""" % (i, added_file) Command(cwd).execute(cmd) - author_str = 'Marcin Kuźminski ' + author_str = 'User ǝɯɐᴎ ' if vcs == 'hg': cmd = """hg commit -m 'commited new %s' -u '%s' %s """ % ( i, author_str, added_file diff --git a/kallithea/tests/other/test_libs.py b/kallithea/tests/other/test_libs.py --- a/kallithea/tests/other/test_libs.py +++ b/kallithea/tests/other/test_libs.py @@ -37,9 +37,9 @@ proto = 'http' TEST_URLS = [ ('%s://127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], '%s://127.0.0.1' % proto), - ('%s://marcink@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], + ('%s://username@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], '%s://127.0.0.1' % proto), - ('%s://marcink:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], + ('%s://username:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], '%s://127.0.0.1' % proto), ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'], '%s://127.0.0.1:8080' % proto), @@ -54,9 +54,9 @@ proto = 'https' TEST_URLS += [ ('%s://127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], '%s://127.0.0.1' % proto), - ('%s://marcink@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], + ('%s://username@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], '%s://127.0.0.1' % proto), - ('%s://marcink:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], + ('%s://username:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'], '%s://127.0.0.1' % proto), ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'], '%s://127.0.0.1:8080' % proto), @@ -105,16 +105,16 @@ class TestLibs(BaseTestCase): def test_mention_extractor(self): from kallithea.lib.utils2 import extract_mentioned_users sample = ( - "@first hi there @marcink here's my email marcin@email.com " + "@first hi there @world here's my email username@email.com " "@lukaszb check @one_more22 it pls @ ttwelve @D[] @one@two@three " - "@MARCIN @maRCiN @2one_more22 @john please see this http://org.pl " + "@UPPER @cAmEL @2one_more22 @john please see this http://org.pl " "@marian.user just do it @marco-polo and next extract @marco_polo " "user.dot hej ! not-needed maril@domain.org" ) s = sorted([ - '2one_more22', 'first', 'marcink', 'lukaszb', 'one', 'one_more22', 'MARCIN', 'maRCiN', 'john', - 'marian.user', 'marco-polo', 'marco_polo'], key=lambda k: k.lower()) + '2one_more22', 'first', 'lukaszb', 'one', 'one_more22', 'UPPER', 'cAmEL', 'john', + 'marian.user', 'marco-polo', 'marco_polo', 'world'], key=lambda k: k.lower()) self.assertEqual(s, extract_mentioned_users(sample)) @parameterized.expand([ @@ -251,19 +251,19 @@ class TestLibs(BaseTestCase): @parameterized.expand([ (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '', 'http://vps1:8000/group/repo1'), - (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/group/repo1'), - (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '/rc', 'http://vps1:8000/rc/group/repo1'), - (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/rc', 'http://user@vps1:8000/rc/group/repo1'), - (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '/rc', 'http://marcink@vps1:8000/rc/group/repo1'), - (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/rc/', 'http://user@vps1:8000/rc/group/repo1'), - (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '/rc/', 'http://marcink@vps1:8000/rc/group/repo1'), + (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'username'}, '', 'http://username@vps1:8000/group/repo1'), + (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '/prefix', 'http://vps1:8000/prefix/group/repo1'), + (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/prefix', 'http://user@vps1:8000/prefix/group/repo1'), + (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'username'}, '/prefix', 'http://username@vps1:8000/prefix/group/repo1'), + (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/prefix/', 'http://user@vps1:8000/prefix/group/repo1'), + (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'username'}, '/prefix/', 'http://username@vps1:8000/prefix/group/repo1'), ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {}, '', 'http://vps1:8000/_23'), - ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/_23'), - ('http://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/_23'), - ('http://{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://vps1:8000/_23'), - ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {'user': 'marcink'}, '', 'https://marcink@proxy1.server.com/group/repo1'), + ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'username'}, '', 'http://username@vps1:8000/_23'), + ('http://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'username'}, '', 'http://username@vps1:8000/_23'), + ('http://{netloc}/_{repoid}', 'group/repo1', {'user': 'username'}, '', 'http://vps1:8000/_23'), + ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://username@proxy1.server.com/group/repo1'), ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {}, '', 'https://proxy1.server.com/group/repo1'), - ('https://proxy1.server.com/{user}/{repo}', 'group/repo1', {'user': 'marcink'}, '', 'https://proxy1.server.com/marcink/group/repo1'), + ('https://proxy1.server.com/{user}/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://proxy1.server.com/username/group/repo1'), ]) def test_clone_url_generator(self, tmpl, repo_name, overrides, prefix, expected): from kallithea.lib.utils2 import get_clone_url @@ -366,7 +366,7 @@ class TestLibs(BaseTestCase): ("/_21/foobar", '21'), ("_21/121", '21'), ("/_21/_12", '21'), - ("_21/rc/foo", '21'), + ("_21/prefix/foo", '21'), ]) def test_get_repo_by_id(self, test, expected): from kallithea.lib.utils import _extract_id_from_repo_name diff --git a/kallithea/tests/scripts/create_rc.sh b/kallithea/tests/scripts/create_rc.sh --- a/kallithea/tests/scripts/create_rc.sh +++ b/kallithea/tests/scripts/create_rc.sh @@ -1,10 +1,10 @@ #!/bin/sh psql -U postgres -h localhost -c 'drop database if exists kallithea;' psql -U postgres -h localhost -c 'create database kallithea;' -paster setup-db rc.ini --force-yes --user=username --password=qweqwe --email=username@example.com --repos=/home/username/repos --no-public-access +paster setup-db server.ini --force-yes --user=username --password=qweqwe --email=username@example.com --repos=/home/username/repos --no-public-access API_KEY=`psql -R " " -A -U postgres -h localhost -c "select api_key from users where admin=TRUE" -d kallithea | awk '{print $2}'` echo "run those after running server" -paster serve rc.ini --pid-file=rc.pid --daemon +paster serve server.ini --pid-file=server.pid --daemon sleep 3 kallithea-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo1 password:qweqwe email:demo1@example.com kallithea-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo2 password:qweqwe email:demo2@example.com @@ -13,5 +13,5 @@ kallithea-api --apikey=$API_KEY --apihos kallithea-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 add_user_to_user_group usergroupid:demo12 userid:demo1 kallithea-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 add_user_to_user_group usergroupid:demo12 userid:demo2 echo "killing server" -kill `cat rc.pid` -rm rc.pid +kill `cat server.pid` +rm server.pid diff --git a/kallithea/tests/scripts/test_concurency.py b/kallithea/tests/scripts/test_concurency.py --- a/kallithea/tests/scripts/test_concurency.py +++ b/kallithea/tests/scripts/test_concurency.py @@ -49,14 +49,14 @@ from kallithea.tests import TESTS_TMP_PA from kallithea.config.environment import load_environment rel_path = dn(dn(dn(dn(os.path.abspath(__file__))))) -conf = appconfig('config:rc.ini', relative_to=rel_path) +conf = appconfig('config:development.ini', relative_to=rel_path) load_environment(conf.global_conf, conf.local_conf) add_cache(conf) USER = 'test_admin' PASS = 'test12' -HOST = 'rc.local' +HOST = 'server.local' METHOD = 'pull' DEBUG = True log = logging.getLogger(__name__) diff --git a/kallithea/tests/scripts/test_crawler.py b/kallithea/tests/scripts/test_crawler.py --- a/kallithea/tests/scripts/test_crawler.py +++ b/kallithea/tests/scripts/test_crawler.py @@ -60,7 +60,7 @@ if not BASE_URI.endswith('/'): print 'Crawling @ %s' % BASE_URI BASE_URI += '%s' -PROJECT_PATH = jn('/', 'home', 'marcink', 'repos') +PROJECT_PATH = jn('/', 'home', 'username', 'repos') PROJECTS = [ #'linux-magx-pbranch', 'CPython', diff --git a/kallithea/tests/vcs/test_utils.py b/kallithea/tests/vcs/test_utils.py --- a/kallithea/tests/vcs/test_utils.py +++ b/kallithea/tests/vcs/test_utils.py @@ -185,14 +185,14 @@ class TestParseDatetime(unittest.TestCas class TestAuthorExtractors(unittest.TestCase): - TEST_AUTHORS = [('Marcin Kuzminski ', - ('Marcin Kuzminski', 'marcin@python-works.com')), - ('Marcin Kuzminski Spaces < marcin@python-works.com >', - ('Marcin Kuzminski Spaces', 'marcin@python-works.com')), - ('Marcin Kuzminski ', - ('Marcin Kuzminski', 'marcin.kuzminski@python-works.com')), - ('mrf RFC_SPEC ', - ('mrf RFC_SPEC', 'marcin+kuzminski@python-works.com')), + TEST_AUTHORS = [("Username Last'o'Name ", + ("Username Last'o'Name", "username@python-works.com")), + ("Username Last'o'Name Spaces < username@python-works.com >", + ("Username Last'o'Name Spaces", "username@python-works.com")), + ("Username Last'o'Name ", + ("Username Last'o'Name", "username.lastname@python-works.com")), + ('mrf RFC_SPEC ', + ('mrf RFC_SPEC', 'username+lastname@python-works.com')), ('username ', ('username', 'user@email.com')), ('username