kallithea Changeset - 313930ae35ad

Changeset - 313930ae35ad

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Thomas De Schampheleire - 10 years ago 2016-05-06 21:21:50
thomas.de_schampheleire@nokia.com

pytest migration: other: convert to TestControllerPytest

4 files changed with 18 insertions and 20 deletions:

kallithea/tests/other/manual_test_vcs_operations.py

kallithea/tests/other/test_libs.py

kallithea/tests/other/test_mail.py

kallithea/tests/other/test_validators.py

0 comments (0 inline, 0 general)

kallithea/tests/other/manual_test_vcs_operations.py

➞

Show inline comments

@@ @@ -163,20 +163,20 @@ def _check_proper_git_push(stdout, stder @@
     assert 'fatal' not in stderr
     assert 'rejected' not in stderr
     assert 'Pushing to' in stderr
     assert 'master -> master' in stderr
-class TestVCSOperations(BaseTestCase):
+class TestVCSOperations(TestControllerPytest):
     @classmethod
     def setup_class(cls):
         #DISABLE ANONYMOUS ACCESS
         set_anonymous_access(False)
-    def setUp(self):
+    def setup_method(self, method):
         r = Repository.get_by_repo_name(GIT_REPO)
         Repository.unlock(r)
         r.enable_locking = False
         Session().add(r)
         Session().commit()

kallithea/tests/other/test_libs.py

➞

Show inline comments

@@ @@ -64,25 +64,26 @@ TEST_URLS += [ @@
     ('%s://user:pass@example.com:8080' % proto, ['%s://' % proto, 'example.com',
                                                 '8080'],
      '%s://example.com:8080' % proto),
+]
-class TestLibs(BaseTestCase):
+class TestLibs(TestControllerPytest):
-    @parameterized.expand(TEST_URLS)
+    @parametrize('test_url,expected,expected_creds', TEST_URLS)
     def test_uri_filter(self, test_url, expected, expected_creds):
         from kallithea.lib.utils2 import uri_filter
         self.assertEqual(uri_filter(test_url), expected)
-    @parameterized.expand(TEST_URLS)
+    @parametrize('test_url,expected,expected_creds', TEST_URLS)
     def test_credentials_filter(self, test_url, expected, expected_creds):
         from kallithea.lib.utils2 import credentials_filter
         self.assertEqual(credentials_filter(test_url), expected_creds)
     @parameterized.expand([('t', True),
     @parametrize('str_bool,expected', [
                            ('t', True),
                            ('true', True),
                            ('y', True),
                            ('yes', True),
                            ('on', True),
                            ('1', True),
                            ('Y', True),
@@ @@ -113,13 +114,13 @@ class TestLibs(BaseTestCase): @@
         expected = set([
             '2one_more22', 'first', 'lukaszb', 'one', 'one_more22', 'UPPER', 'cAmEL', 'john',
             'marian.user', 'marco-polo', 'marco_polo', 'world'])
         self.assertEqual(expected, set(extract_mentioned_usernames(sample)))
-    @parameterized.expand([
+    @parametrize('age_args,expected', [
         (dict(), u'just now'),
         (dict(seconds= -1), u'1 second ago'),
         (dict(seconds= -60 * 2), u'2 minutes ago'),
         (dict(hours= -1), u'1 hour ago'),
         (dict(hours= -24), u'1 day ago'),
         (dict(hours= -24 * 5), u'5 days ago'),
@@ @@ -136,13 +137,13 @@ class TestLibs(BaseTestCase): @@
         from kallithea.lib.utils2 import age
         from dateutil import relativedelta
         n = datetime.datetime(year=2012, month=5, day=17)
         delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
         self.assertEqual(age(n + delt(**age_args), now=n), expected)
-    @parameterized.expand([
+    @parametrize('age_args,expected', [
         (dict(), u'just now'),
         (dict(seconds= -1), u'1 second ago'),
         (dict(seconds= -60 * 2), u'2 minutes ago'),
         (dict(hours= -1), u'1 hour ago'),
         (dict(hours= -24), u'1 day ago'),
         (dict(hours= -24 * 5), u'5 days ago'),
@@ @@ -160,13 +161,13 @@ class TestLibs(BaseTestCase): @@
         from kallithea.lib.utils2 import age
         from dateutil import relativedelta
         n = datetime.datetime(year=2012, month=5, day=17)
         delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
         self.assertEqual(age(n + delt(**age_args), show_short_version=True, now=n), expected)
-    @parameterized.expand([
+    @parametrize('age_args,expected', [
         (dict(), u'just now'),
         (dict(seconds=1), u'in 1 second'),
         (dict(seconds=60 * 2), u'in 2 minutes'),
         (dict(hours=1), u'in 1 hour'),
         (dict(hours=24), u'in 1 day'),
         (dict(hours=24 * 5), u'in 5 days'),
@@ @@ -245,13 +246,13 @@ class TestLibs(BaseTestCase): @@
             fake = fake_tmpl_context(_url='{scheme}://{netloc}/{md5email}/{size}')
             with mock.patch('pylons.tmpl_context', fake):
                 em = 'test@example.com'
                 grav = gravatar_url(email_address=em, size=24)
                 assert grav == 'https://example.com/%s/%s' % (_md5(em), 24)
-    @parameterized.expand([
+    @parametrize('tmpl,repo_name,overrides,prefix,expected', [
         (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '', 'http://vps1:8000/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'),
@@ @@ -282,13 +283,13 @@ class TestLibs(BaseTestCase): @@
         def url_func(match_obj):
             _url = match_obj.groups()[0]
             return tmpl % (url_ or '/some-url', _url)
         return URL_PAT.sub(url_func, text)
-    @parameterized.expand([
+    @parametrize('sample,expected', [
       ("",
        ""),
       ("git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68",
        "git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68"),
       ("from rev 000000000000",
        "from rev url[000000000000]"),
@@ @@ -320,13 +321,13 @@ class TestLibs(BaseTestCase): @@
         expected = self._quick_url(expected)
         with mock.patch('pylons.url', fake_url):
             from kallithea.lib.helpers import urlify_changesets
             self.assertEqual(urlify_changesets(sample, 'repo_name'), expected)
-    @parameterized.expand([
+    @parametrize('sample,expected,url_', [
       ("",
        "",
        ""),
       ("https://svn.apache.org/repos",
        "url[https://svn.apache.org/repos]",
        "https://svn.apache.org/repos"),
@@ @@ -347,13 +348,13 @@ class TestLibs(BaseTestCase): @@
     def test_urlify_test(self, sample, expected, url_):
         from kallithea.lib.helpers import urlify_text
         expected = self._quick_url(expected,
                                    tmpl="""<a href="%s">%s</a>""", url_=url_)
         self.assertEqual(urlify_text(sample), expected)
-    @parameterized.expand([
+    @parametrize('test,expected', [
       ("", None),
       ("/_2", '2'),
       ("_2", '2'),
       ("/_2/", '2'),
       ("_2/", '2'),

kallithea/tests/other/test_mail.py

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ class smtplib_mock(object): @@
         smtplib_mock.lastsender = sender
         smtplib_mock.lastdest = dest
         smtplib_mock.lastmsg = msg
         pass
 @mock.patch('kallithea.lib.rcmail.smtp_mailer.smtplib', smtplib_mock)
-class TestMail(BaseTestCase):
+class TestMail(TestControllerPytest):
     def test_send_mail_trivial(self):
         mailserver = 'smtp.mailserver.org'
         recipients = ['rcpt1', 'rcpt2']
         envelope_from = 'noreply@mailserver.org'
         subject = 'subject'

kallithea/tests/other/test_validators.py

➞

Show inline comments

@@ @@ -11,18 +11,15 @@ from kallithea.model.meta import Session @@
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()
-class TestRepoGroups(BaseTestCase):
+class TestRepoGroups(TestControllerPytest):
     def setUp(self):
         pass
     def tearDown(self):
     def teardown_method(self, method):
         Session.remove()
     def test_Message_extractor(self):
         validator = v.ValidUsername()
         self.assertRaises(formencode.Invalid, validator.to_python, 'default')
@@ @@ -161,13 +158,13 @@ class TestRepoGroups(BaseTestCase): @@
 #                                                'repo_group': gr.group_id})
     def test_ValidForkName(self):
         # this uses ValidRepoName validator
         assert True
-    @parameterized.expand([
+    @parametrize('name,expected', [
         ('test', 'test'), ('lolz!', 'lolz'), ('  aavv', 'aavv'),
         ('ala ma kota', 'ala-ma-kota'), ('@nooo', 'nooo'),
         ('$!haha lolz !', 'haha-lolz'), ('$$$$$', ''), ('{}OK!', 'OK'),
         ('/]re po', 're-po')])
     def test_SlugifyName(self, name, expected):
         validator = v.SlugifyName()

0 comments (0 inline, 0 general)