Changeset - 82ea8d67fc62
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 10 years ago 2015-07-23 00:52:29
madski@unity3d.com
validators: cleanup of message wording

NotReviewedRevisions was unused and could thus got the big cleanup ...
5 files changed with 17 insertions and 77 deletions:
kallithea/model/user.py
2
2
kallithea/model/validators.py
8
41
kallithea/tests/functional/test_login.py
5
5
kallithea/tests/functional/test_my_account.py
2
2
kallithea/tests/other/test_validators.py
27
0 comments (0 inline, 0 general)
kallithea/model/user.py
➞
Show inline comments
 
@@ -246,26 +246,26 @@ class UserModel(BaseModel):
 

			




	
	
	
		
 
            setattr(user, k, v)

			




	
	
	
		
 
        self.sa.add(user)

			




	
	
	
		
 
        return user

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, user, cur_user=None):

			




	
	
	
		
 
        if not cur_user:

			




	
	
	
		
 
            cur_user = getattr(get_current_authuser(), 'username', None)

			




	
	
	
		
 
        user = self._get_user(user)

			




	
	
	
		
 

			




	
	
	
		
 
        if user.username == User.DEFAULT_USER:

			




	
	
	
		
 
            raise DefaultUserException(

			




	
	
	
		
 
                _("You can't remove this user since it's"

			




	
	
	
		
 
                  " crucial for entire application"))

			




	
	
	
		
 
                _("You can't remove this user since it is"

			




	
	
	
		
 
                  " crucial for the entire application"))

			




	
	
	
		
 
        if user.repositories:

			




	
	
	
		
 
            repos = [x.repo_name for x in user.repositories]

			




	
	
	
		
 
            raise UserOwnsReposException(

			




	
	
	
		
 
                _('User "%s" still owns %s repositories and cannot be '

			




	
	
	
		
 
                  'removed. Switch owners or remove those repositories: %s')

			




	
	
	
		
 
                % (user.username, len(repos), ', '.join(repos)))

			




	
	
	
		
 
        if user.repo_groups:

			




	
	
	
		
 
            repogroups = [x.group_name for x in user.repo_groups]

			




	
	
	
		
 
            raise UserOwnsReposException(_(

			




	
	
	
		
 
                'User "%s" still owns %s repository groups and cannot be '

			




	
	
	
		
 
                'removed. Switch owners or remove those repository groups: %s')

			




	
	
	
		
 
                % (user.username, len(repogroups), ', '.join(repogroups)))

			




        

    


    
    

    

        

                

                    kallithea/model/validators.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -86,28 +86,28 @@ def UniqueListFromString():

			




	
	
	
		
 

			




	
	
	
		
 
        def empty_value(self, value):

			




	
	
	
		
 
            return []

			




	
	
	
		
 

			




	
	
	
		
 
    return _UniqueListFromString

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidUsername(edit=False, old_data={}):

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'username_exists': _('Username "%(username)s" already exists'),

			




	
	
	
		
 
            'system_invalid_username':

			




	
	
	
		
 
                _('Username "%(username)s" is forbidden'),

			




	
	
	
		
 
                _('Username "%(username)s" cannot be used'),

			




	
	
	
		
 
            'invalid_username':

			




	
	
	
		
 
                _('Username may only contain alphanumeric characters '

			




	
	
	
		
 
                    'underscores, periods or dashes and must begin with '

			




	
	
	
		
 
                  'underscores, periods or dashes and must begin with an '

			




	
	
	
		
 
                    'alphanumeric character or underscore')

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            if value in ['default', 'new_user']:

			




	
	
	
		
 
                msg = M(self, 'system_invalid_username', state, username=value)

			




	
	
	
		
 
                raise formencode.Invalid(msg, value, state)

			




	
	
	
		
 
            #check if user is unique

			




	
	
	
		
 
            old_un = None

			




	
	
	
		
 
            if edit:

			




	
	
	
		
 
                old_un = User.get(old_data.get('user_id')).username

			




	
	
	
		
 

			




	
	
		
 
@@ -291,27 +291,27 @@ def ValidPasswordsMatch(passwd='new_pass

			




	
	
	
		
 
            pass_val = value.get('password') or value.get(passwd)

			




	
	
	
		
 
            if pass_val != value[passwd_confirmation]:

			




	
	
	
		
 
                msg = M(self, 'password_mismatch', state)

			




	
	
	
		
 
                raise formencode.Invalid(msg, value, state,

			




	
	
	
		
 
                     error_dict={passwd:msg, passwd_confirmation: msg}

			




	
	
	
		
 
                )

			




	
	
	
		
 
    return _validator

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidAuth():

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'invalid_password': _('invalid password'),

			




	
	
	
		
 
            'invalid_username': _('invalid user name'),

			




	
	
	
		
 
            'disabled_account': _('Your account is disabled')

			




	
	
	
		
 
            'invalid_password': _('Invalid password'),

			




	
	
	
		
 
            'invalid_username': _('Invalid username'),

			




	
	
	
		
 
            'disabled_account': _('Account has been disabled')

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            from kallithea.lib import auth_modules

			




	
	
	
		
 

			




	
	
	
		
 
            password = value['password']

			




	
	
	
		
 
            username = value['username']

			




	
	
	
		
 

			




	
	
	
		
 
            if not auth_modules.authenticate(username, password):

			




	
	
	
		
 
                user = User.get_by_username(username)

			




	
	
	
		
 
                if user and not user.active:

			




	
	
	
		
 
                    log.warning('user %s is disabled' % username)

			




	
	
		
 
@@ -337,25 +337,25 @@ def ValidAuthToken():

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            if value != authentication_token():

			




	
	
	
		
 
                msg = M(self, 'invalid_token', state)

			




	
	
	
		
 
                raise formencode.Invalid(msg, value, state)

			




	
	
	
		
 
    return _validator

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidRepoName(edit=False, old_data={}):

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'invalid_repo_name':

			




	
	
	
		
 
                _('Repository name %(repo)s is disallowed'),

			




	
	
	
		
 
                _('Repository name %(repo)s is not allowed'),

			




	
	
	
		
 
            'repository_exists':

			




	
	
	
		
 
                _('Repository named %(repo)s already exists'),

			




	
	
	
		
 
            'repository_in_group_exists': _('Repository "%(repo)s" already '

			




	
	
	
		
 
                                            'exists in group "%(group)s"'),

			




	
	
	
		
 
            'same_group_exists': _('Repository group with name "%(repo)s" '

			




	
	
	
		
 
                                   'already exists')

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        def _to_python(self, value, state):

			




	
	
	
		
 
            repo_name = repo_name_slug(value.get('repo_name', ''))

			




	
	
	
		
 
            repo_group = value.get('repo_group')

			




	
	
	
		
 
            if repo_group:

			




	
	
		
 
@@ -697,45 +697,45 @@ def ValidPath():

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            if not os.path.isdir(value):

			




	
	
	
		
 
                msg = M(self, 'invalid_path', state)

			




	
	
	
		
 
                raise formencode.Invalid(msg, value, state,

			




	
	
	
		
 
                    error_dict=dict(paths_root_path=msg)

			




	
	
	
		
 
                )

			




	
	
	
		
 
    return _validator

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def UniqSystemEmail(old_data={}):

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'email_taken': _('This e-mail address is already taken')

			




	
	
	
		
 
            'email_taken': _('This e-mail address is already in use')

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        def _to_python(self, value, state):

			




	
	
	
		
 
            return value.lower()

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            if (old_data.get('email') or '').lower() != value:

			




	
	
	
		
 
                user = User.get_by_email(value, case_insensitive=True)

			




	
	
	
		
 
                if user:

			




	
	
	
		
 
                    msg = M(self, 'email_taken', state)

			




	
	
	
		
 
                    raise formencode.Invalid(msg, value, state,

			




	
	
	
		
 
                        error_dict=dict(email=msg)

			




	
	
	
		
 
                    )

			




	
	
	
		
 
    return _validator

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidSystemEmail():

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'non_existing_email': _('e-mail "%(email)s" does not exist.')

			




	
	
	
		
 
            'non_existing_email': _('E-mail address "%(email)s" not found')

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        def _to_python(self, value, state):

			




	
	
	
		
 
            return value.lower()

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            user = User.get_by_email(value, case_insensitive=True)

			




	
	
	
		
 
            if user is None:

			




	
	
	
		
 
                msg = M(self, 'non_existing_email', state, email=value)

			




	
	
	
		
 
                raise formencode.Invalid(msg, value, state,

			




	
	
	
		
 
                    error_dict=dict(email=msg)

			




	
	
	
		
 
                )

			




	
	
		
 
@@ -763,57 +763,24 @@ def AttrLoginValidator():

			




	
	
	
		
 
    class _validator(formencode.validators.UnicodeString):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'invalid_cn':

			




	
	
	
		
 
                  _('The LDAP Login attribute of the CN must be specified - '

			




	
	
	
		
 
                    'this is the name of the attribute that is equivalent '

			




	
	
	
		
 
                    'to "username"')

			




	
	
	
		
 
        }

			




	
	
	
		
 
        messages['empty'] = messages['invalid_cn']

			




	
	
	
		
 

			




	
	
	
		
 
    return _validator

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def NotReviewedRevisions(repo_id):

			




	
	
	
		
 
    class _validator(formencode.validators.FancyValidator):

			




	
	
	
		
 
        messages = {

			




	
	
	
		
 
            'rev_already_reviewed':

			




	
	
	
		
 
                  _('Revisions %(revs)s are already part of pull request '

			




	
	
	
		
 
                    'or have set status')

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            # check revisions if they are not reviewed, or a part of another

			




	
	
	
		
 
            # pull request

			




	
	
	
		
 
            statuses = ChangesetStatus.query()\

			




	
	
	
		
 
                .filter(ChangesetStatus.revision.in_(value))\

			




	
	
	
		
 
                .filter(ChangesetStatus.repo_id == repo_id)\

			




	
	
	
		
 
                .all()

			




	
	
	
		
 

			




	
	
	
		
 
            errors = []

			




	
	
	
		
 
            for cs in statuses:

			




	
	
	
		
 
                if cs.pull_request_id:

			




	
	
	
		
 
                    errors.append(['pull_req', cs.revision[:12]])

			




	
	
	
		
 
                elif cs.status:

			




	
	
	
		
 
                    errors.append(['status', cs.revision[:12]])

			




	
	
	
		
 

			




	
	
	
		
 
            if errors:

			




	
	
	
		
 
                revs = ','.join([x[1] for x in errors])

			




	
	
	
		
 
                msg = M(self, 'rev_already_reviewed', state, revs=revs)

			




	
	
	
		
 
                raise formencode.Invalid(msg, value, state,

			




	
	
	
		
 
                    error_dict=dict(revisions=revs)

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
    return _validator

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidIp():

			




	
	
	
		
 
    class _validator(CIDR):

			




	
	
	
		
 
        messages = dict(

			




	
	
	
		
 
            badFormat=_('Please enter a valid IPv4 or IPv6 address'),

			




	
	
	
		
 
            illegalBits=_('The network size (bits) must be within the range'

			




	
	
	
		
 
                ' of 0-32 (not %(bits)r)')

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        def to_python(self, value, state):

			




	
	
	
		
 
            v = super(_validator, self).to_python(value, state)

			




	
	
	
		
 
            v = v.strip()

			




	
	
	
		
 
            net = ipaddr.IPNetwork(address=v)

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_login.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -120,26 +120,26 @@ class TestLoginController(TestController

			




	
	
	
		
 
        response = self.app.post(url(controller='login', action='index'),

			




	
	
	
		
 
                                 {'username': TEST_USER_ADMIN_LOGIN,

			




	
	
	
		
 
                                  'password': 'as'})

			




	
	
	
		
 
        self.assertEqual(response.status, '200 OK')

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('Enter 3 characters or more')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_login_wrong_username_password(self):

			




	
	
	
		
 
        response = self.app.post(url(controller='login', action='index'),

			




	
	
	
		
 
                                 {'username': 'error',

			




	
	
	
		
 
                                  'password': 'test12'})

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('invalid user name')

			




	
	
	
		
 
        response.mustcontain('invalid password')

			




	
	
	
		
 
        response.mustcontain('Invalid username')

			




	
	
	
		
 
        response.mustcontain('Invalid password')

			




	
	
	
		
 

			




	
	
	
		
 
    # verify that get arguments are correctly passed along login redirection

			




	
	
	
		
 

			




	
	
	
		
 
    @parameterized.expand([

			




	
	
	
		
 
        ({'foo':'one', 'bar':'two'}, ('foo=one', 'bar=two')),

			




	
	
	
		
 
        ({'blue': u'blå'.encode('utf-8'), 'green':u'grøn'},

			




	
	
	
		
 
             ('blue=bl%C3%A5', 'green=gr%C3%B8n')),

			




	
	
	
		
 
    ])

			




	
	
	
		
 
    def test_redirection_to_login_form_preserves_get_args(self, args, args_encoded):

			




	
	
	
		
 
        with fixture.anon_access(False):

			




	
	
	
		
 
            response = self.app.get(url(controller='summary', action='index',

			




	
	
	
		
 
                                        repo_name=HG_REPO,

			




	
	
		
 
@@ -178,26 +178,26 @@ class TestLoginController(TestController

			




	
	
	
		
 
    @parameterized.expand([

			




	
	
	
		
 
        ({'foo':'one', 'bar':'two'}, ('foo=one', 'bar=two')),

			




	
	
	
		
 
        ({'blue': u'blå'.encode('utf-8'), 'green':u'grøn'},

			




	
	
	
		
 
             ('blue=bl%C3%A5', 'green=gr%C3%B8n')),

			




	
	
	
		
 
    ])

			




	
	
	
		
 
    def test_login_form_after_incorrect_login_preserves_get_args(self, args, args_encoded):

			




	
	
	
		
 
        response = self.app.post(url(controller='login', action='index',

			




	
	
	
		
 
                                     came_from = '/_admin/users',

			




	
	
	
		
 
                                     **args),

			




	
	
	
		
 
                                 {'username': 'error',

			




	
	
	
		
 
                                  'password': 'test12'})

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('invalid user name')

			




	
	
	
		
 
        response.mustcontain('invalid password')

			




	
	
	
		
 
        response.mustcontain('Invalid username')

			




	
	
	
		
 
        response.mustcontain('Invalid password')

			




	
	
	
		
 
        for encoded in args_encoded:

			




	
	
	
		
 
            self.assertIn(encoded, response.form.action)

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # REGISTRATIONS

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    def test_register(self):

			




	
	
	
		
 
        response = self.app.get(url(controller='login', action='register'))

			




	
	
	
		
 
        response.mustcontain('Sign Up')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_register_err_same_username(self):

			




	
	
	
		
 
        uname = TEST_USER_ADMIN_LOGIN

			




	
	
		
 
@@ -251,25 +251,25 @@ class TestLoginController(TestController

			




	
	
	
		
 
    def test_register_err_username(self):

			




	
	
	
		
 
        response = self.app.post(url(controller='login', action='register'),

			




	
	
	
		
 
                                            {'username': 'error user',

			




	
	
	
		
 
                                             'password': 'test12',

			




	
	
	
		
 
                                             'password_confirmation': 'test12',

			




	
	
	
		
 
                                             'email': 'goodmailm',

			




	
	
	
		
 
                                             'firstname': 'test',

			




	
	
	
		
 
                                             'lastname': 'test'})

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('An email address must contain a single @')

			




	
	
	
		
 
        response.mustcontain('Username may only contain '

			




	
	
	
		
 
                'alphanumeric characters underscores, '

			




	
	
	
		
 
                'periods or dashes and must begin with '

			




	
	
	
		
 
                'periods or dashes and must begin with an '

			




	
	
	
		
 
                'alphanumeric character')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_register_err_case_sensitive(self):

			




	
	
	
		
 
        usr = TEST_USER_ADMIN_LOGIN.title()

			




	
	
	
		
 
        response = self.app.post(url(controller='login', action='register'),

			




	
	
	
		
 
                                            {'username': usr,

			




	
	
	
		
 
                                             'password': 'test12',

			




	
	
	
		
 
                                             'password_confirmation': 'test12',

			




	
	
	
		
 
                                             'email': 'goodmailm',

			




	
	
	
		
 
                                             'firstname': 'test',

			




	
	
	
		
 
                                             'lastname': 'test'})

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_my_account.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -42,25 +42,25 @@ class TestMyAccountController(TestContro

			




	
	
	
		
 

			




	
	
	
		
 
    def test_my_account_my_emails(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url('my_account_emails'))

			




	
	
	
		
 
        response.mustcontain('No additional emails specified')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_my_account_my_emails_add_existing_email(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url('my_account_emails'))

			




	
	
	
		
 
        response.mustcontain('No additional emails specified')

			




	
	
	
		
 
        response = self.app.post(url('my_account_emails'),

			




	
	
	
		
 
                                 {'new_email': TEST_USER_REGULAR_EMAIL, '_authentication_token': self.authentication_token()})

			




	
	
	
		
 
        self.checkSessionFlash(response, 'This e-mail address is already taken')

			




	
	
	
		
 
        self.checkSessionFlash(response, 'This e-mail address is already in use')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_my_account_my_emails_add_mising_email_in_form(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url('my_account_emails'))

			




	
	
	
		
 
        response.mustcontain('No additional emails specified')

			




	
	
	
		
 
        response = self.app.post(url('my_account_emails'),)

			




	
	
	
		
 
        self.checkSessionFlash(response, 'Please enter an email address')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_my_account_my_emails_add_remove(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url('my_account_emails'))

			




	
	
	
		
 
        response.mustcontain('No additional emails specified')

			




	
	
		
 
@@ -152,25 +152,25 @@ class TestMyAccountController(TestContro

			




	
	
	
		
 
        new_email = TEST_USER_REGULAR_EMAIL  # already existing email

			




	
	
	
		
 
        response = self.app.post(url('my_account'),

			




	
	
	
		
 
                                params=dict(

			




	
	
	
		
 
                                    username=TEST_USER_ADMIN_LOGIN,

			




	
	
	
		
 
                                    new_password=TEST_USER_ADMIN_PASS,

			




	
	
	
		
 
                                    password_confirmation='test122',

			




	
	
	
		
 
                                    firstname='NewName',

			




	
	
	
		
 
                                    lastname='NewLastname',

			




	
	
	
		
 
                                    email=new_email,

			




	
	
	
		
 
                                    _authentication_token=self.authentication_token())

			




	
	
	
		
 
                                )

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('This e-mail address is already taken')

			




	
	
	
		
 
        response.mustcontain('This e-mail address is already in use')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_my_account_update_err(self):

			




	
	
	
		
 
        self.log_user(TEST_USER_REGULAR2_LOGIN, TEST_USER_REGULAR2_PASS)

			




	
	
	
		
 

			




	
	
	
		
 
        new_email = 'newmail.pl'

			




	
	
	
		
 
        response = self.app.post(url('my_account'),

			




	
	
	
		
 
                                 params=dict(

			




	
	
	
		
 
                                            username=TEST_USER_ADMIN_LOGIN,

			




	
	
	
		
 
                                            new_password=TEST_USER_ADMIN_PASS,

			




	
	
	
		
 
                                            password_confirmation='test122',

			




	
	
	
		
 
                                            firstname='NewName',

			




	
	
	
		
 
                                            lastname='NewLastname',

			




        

    


    
    

    

        

                

                    kallithea/tests/other/test_validators.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -222,39 +222,12 @@ class TestRepoGroups(BaseTestCase):

			




	
	
	
		
 

			




	
	
	
		
 
    def test_LdapLibValidator(self):

			




	
	
	
		
 
        if ldap_lib_installed:

			




	
	
	
		
 
            validator = v.LdapLibValidator()

			




	
	
	
		
 
            self.assertEqual("DN", validator.to_python('DN'))

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            validator = v.LdapLibValidator()

			




	
	
	
		
 
            self.assertRaises(v.LdapImportError, validator.to_python, 'err')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_AttrLoginValidator(self):

			




	
	
	
		
 
        validator = v.AttrLoginValidator()

			




	
	
	
		
 
        self.assertEqual('DN_attr', validator.to_python('DN_attr'))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_NotReviewedRevisions(self):

			




	
	
	
		
 
        user = ChangesetStatusModel()._get_user(TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 
        repo = Repository.get_by_repo_name(HG_REPO)

			




	
	
	
		
 
        validator = v.NotReviewedRevisions(repo.repo_id)

			




	
	
	
		
 
        rev = '0' * 40

			




	
	
	
		
 
        # add status for a rev, that should throw an error because it is already

			




	
	
	
		
 
        # reviewed

			




	
	
	
		
 
        new_comment = ChangesetComment()

			




	
	
	
		
 
        new_comment.repo = repo

			




	
	
	
		
 
        new_comment.author = user

			




	
	
	
		
 
        new_comment.text = u''

			




	
	
	
		
 
        Session().add(new_comment)

			




	
	
	
		
 
        Session().flush()

			




	
	
	
		
 
        new_status = ChangesetStatus()

			




	
	
	
		
 
        new_status.author = user

			




	
	
	
		
 
        new_status.repo = repo

			




	
	
	
		
 
        new_status.status = ChangesetStatus.STATUS_APPROVED

			




	
	
	
		
 
        new_status.comment = new_comment

			




	
	
	
		
 
        new_status.revision = rev

			




	
	
	
		
 
        Session().add(new_status)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.assertRaises(formencode.Invalid, validator.to_python, [rev])

			




	
	
	
		
 
        finally:

			




	
	
	
		
 
            Session().delete(new_status)

			




	
	
	
		
 
            Session().commit()

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.