kallithea Changeset - 623e1d68a2e0

Changeset - 623e1d68a2e0

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-06-26 22:20:08
marcin@python-works.com

fixed few test failures

3 files changed with 12 insertions and 8 deletions:

rhodecode/tests/functional/test_changelog.py

rhodecode/tests/test_models.py

rhodecode/tests/test_validators.py

0 comments (0 inline, 0 general)

rhodecode/tests/functional/test_changelog.py

➞

Show inline comments

 from rhodecode.tests import *
 class TestChangelogController(TestController):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO))
         response.mustcontain("""<div id="chg_20" class="container tablerow1">""")
         response.mustcontain(
             """<input class="changeset_range" id="5e204e7583b9" """
             """name="5e204e7583b9" type="checkbox" value="1" />"""
             """<input class="changeset_range" """
             """id="5e204e7583b9c8e7b93a020bd036564b1e731dae" """
             """name="5e204e7583b9c8e7b93a020bd036564b1e731dae" """
             """type="checkbox" value="1" />"""
+        )
         response.mustcontain(
             """<span class="changeset_id">154:"""
             """<span class="changeset_hash">5e204e7583b9</span></span>"""
+        )
         response.mustcontain("""Small update at simplevcs app""")
         response.mustcontain(
             """<div id="5e204e7583b9c8e7b93a020bd036564b1e731dae"  """
             """style="float:right;" class="changed_total tooltip" """
             """title="Affected number of files, click to show """
             """more details">3</div>"""
+        )
         #pagination
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':1})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':2})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':3})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':4})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':5})
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO), {'page':6})
         # Test response after pagination...
         response.mustcontain(
             """<input class="changeset_range" id="46ad32a4f974" """
             """name="46ad32a4f974" type="checkbox" value="1" />"""
             """<input class="changeset_range" """
             """id="46ad32a4f974e45472a898c6b0acb600320579b1" """
             """name="46ad32a4f974e45472a898c6b0acb600320579b1" """
             """type="checkbox" value="1" />"""
+        )
         response.mustcontain(
             """<span class="changeset_id">64:"""
             """<span class="changeset_hash">46ad32a4f974</span></span>"""
+        )
         response.mustcontain(
             """<div id="46ad32a4f974e45472a898c6b0acb600320579b1"  """
             """style="float:right;" class="changed_total tooltip" """
             """title="Affected number of files, click to show """
             """more details">21</div>"""
+        )
         response.mustcontain(
             """<a href="/%s/changeset/"""
             """46ad32a4f974e45472a898c6b0acb600320579b1" """
             """title="Merge with 2e6a2bf9356ca56df08807f4ad86d480da72a8f4">"""
             """46ad32a4f974</a>""" % HG_REPO
+        )

rhodecode/tests/test_models.py

➞

Show inline comments

@@ @@ -217,104 +217,104 @@ class TestUser(unittest.TestCase): @@
             Session.add(m)
             Session.commit()
         self.assertRaises(AttributeError, do)
         UserModel().delete(usr.user_id)
         Session.commit()
     def test_extra_email_map(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
                                      email=u'main_email@rhodecode.org',
                                      firstname=u'u1', lastname=u'u1')
         Session.commit()
         m = UserEmailMap()
         m.email = u'main_email2@rhodecode.org'
         m.user = usr
         Session.add(m)
         Session.commit()
         u = User.get_by_email(email='main_email@rhodecode.org')
         self.assertEqual(usr.user_id, u.user_id)
         self.assertEqual(usr.username, u.username)
         u = User.get_by_email(email='main_email2@rhodecode.org')
         self.assertEqual(usr.user_id, u.user_id)
         self.assertEqual(usr.username, u.username)
         u = User.get_by_email(email='main_email3@rhodecode.org')
         self.assertEqual(None, u)
         UserModel().delete(usr.user_id)
         Session.commit()
 class TestNotifications(unittest.TestCase):
     def __init__(self, methodName='runTest'):
         Session.remove()
         self.u1 = UserModel().create_or_update(username=u'u1',
                                         password=u'qweqwe',
                                         email=u'u1@rhodecode.org',
                                         firstname=u'u1', lastname=u'u1')
         Session.commit()
         self.u1 = self.u1.user_id
         self.u2 = UserModel().create_or_update(username=u'u2',
                                         password=u'qweqwe',
                                         email=u'u2@rhodecode.org',
-                                        name=u'u2', lastname=u'u3')
+                                        firstname=u'u2', lastname=u'u3')
         Session.commit()
         self.u2 = self.u2.user_id
         self.u3 = UserModel().create_or_update(username=u'u3',
                                         password=u'qweqwe',
                                         email=u'u3@rhodecode.org',
-                                        name=u'u3', lastname=u'u3')
+                                        firstname=u'u3', lastname=u'u3')
         Session.commit()
         self.u3 = self.u3.user_id
         super(TestNotifications, self).__init__(methodName=methodName)
     def _clean_notifications(self):
         for n in Notification.query().all():
             Session.delete(n)
         Session.commit()
         self.assertEqual(Notification.query().all(), [])
     def tearDown(self):
         self._clean_notifications()
     def test_create_notification(self):
         self.assertEqual([], Notification.query().all())
         self.assertEqual([], UserNotification.query().all())
         usrs = [self.u1, self.u2]
         notification = NotificationModel().create(created_by=self.u1,
                                            subject=u'subj', body=u'hi there',
                                            recipients=usrs)
         Session.commit()
         u1 = User.get(self.u1)
         u2 = User.get(self.u2)
         u3 = User.get(self.u3)
         notifications = Notification.query().all()
         self.assertEqual(len(notifications), 1)
         unotification = UserNotification.query()\
             .filter(UserNotification.notification == notification).all()
         self.assertEqual(notifications[0].recipients, [u1, u2])
         self.assertEqual(notification.notification_id,
                          notifications[0].notification_id)
         self.assertEqual(len(unotification), len(usrs))
         self.assertEqual([x.user.user_id for x in unotification], usrs)
     def test_user_notifications(self):
         self.assertEqual([], Notification.query().all())
         self.assertEqual([], UserNotification.query().all())
         notification1 = NotificationModel().create(created_by=self.u1,
                                             subject=u'subj', body=u'hi there1',
                                             recipients=[self.u3])
         Session.commit()
         notification2 = NotificationModel().create(created_by=self.u1,

rhodecode/tests/test_validators.py

➞

Show inline comments

@@ @@ -125,98 +125,98 @@ class TestReposGroups(unittest.TestCase) @@
             'username': 'err',
             'password': 'err',
+        }
         self.assertEqual(valid_creds, validator.to_python(valid_creds))
         self.assertRaises(formencode.Invalid,
                           validator.to_python, invalid_creds)
     def test_ValidAuthToken(self):
         validator = v.ValidAuthToken()
         # this is untestable without a threadlocal
 #        self.assertRaises(formencode.Invalid,
 #                          validator.to_python, 'BadToken')
         validator
     def test_ValidRepoName(self):
         validator = v.ValidRepoName()
         self.assertRaises(formencode.Invalid,
                           validator.to_python, {'repo_name': ''})
         self.assertRaises(formencode.Invalid,
                           validator.to_python, {'repo_name': HG_REPO})
         gr = ReposGroupModel().create(group_name='group_test',
                                       group_description='desc',
                                       parent=None,)
         self.assertRaises(formencode.Invalid,
                           validator.to_python, {'repo_name': gr.group_name})
         #TODO: write an error case for that ie. create a repo withinh a group
 #        self.assertRaises(formencode.Invalid,
 #                          validator.to_python, {'repo_name': 'some',
 #                                                'repo_group': gr.group_id})
     def test_ValidForkName(self):
         # this uses ValidRepoName validator
         assert True
     @parameterized.expand([
         ('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()
         self.assertEqual(expected, validator.to_python(name))
     def test_ValidCloneUri(self):
-            assert False
+            self.fail('TODO:')
     def test_ValidForkType(self):
             validator = v.ValidForkType(old_data={'repo_type': 'hg'})
             self.assertEqual('hg', validator.to_python('hg'))
             self.assertRaises(formencode.Invalid, validator.to_python, 'git')
     def test_ValidPerms(self):
-            assert False
+            self.fail('TODO:')
     def test_ValidSettings(self):
         validator = v.ValidSettings()
         self.assertEqual({'pass': 'pass'},
                          validator.to_python(value={'user': 'test',
                                                     'pass': 'pass'}))
         self.assertEqual({'user2': 'test', 'pass': 'pass'},
                          validator.to_python(value={'user2': 'test',
                                                     'pass': 'pass'}))
     def test_ValidPath(self):
             validator = v.ValidPath()
             self.assertEqual(TESTS_TMP_PATH,
                              validator.to_python(TESTS_TMP_PATH))
             self.assertRaises(formencode.Invalid, validator.to_python,
                               '/no_such_dir')
     def test_UniqSystemEmail(self):
         validator = v.UniqSystemEmail(old_data={})
         self.assertEqual('mail@python.org',
                          validator.to_python('MaiL@Python.org'))
         email = TEST_USER_REGULAR2_EMAIL
         self.assertRaises(formencode.Invalid, validator.to_python, email)
     def test_ValidSystemEmail(self):
         validator = v.ValidSystemEmail()
         email = TEST_USER_REGULAR2_EMAIL
         self.assertEqual(email, validator.to_python(email))
         self.assertRaises(formencode.Invalid, validator.to_python, 'err')
     def test_LdapLibValidator(self):
         validator = v.LdapLibValidator()
         self.assertRaises(v.LdapImportError, validator.to_python, 'err')
     def test_AttrLoginValidator(self):
         validator = v.AttrLoginValidator()
         self.assertRaises(formencode.Invalid, validator.to_python, 123)

0 comments (0 inline, 0 general)