kallithea Changeset - e0735ea41d8d

Changeset - e0735ea41d8d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 9 years ago 2016-06-29 16:52:07
madski@unity3d.com

tests: fix Python 2.6 compatibility in string formatting

Python 2.6 would fail with:
ValueError: zero length field name in format

1 file changed with 5 insertions and 5 deletions:

kallithea/tests/other/test_auth_ldap.py

0 comments (0 inline, 0 general)

kallithea/tests/other/test_auth_ldap.py

➞

Show inline comments

@@ @@ -24,29 +24,29 @@ class _AuthLdapMock(): @@
         return 'spam dn', dict(test_ldap_firstname=['spam ldap first name'],
                                test_ldap_lastname=['spam ldap last name'],
                                test_ldap_email=['spam ldap email'])
 def test_update_user_attributes_from_ldap(monkeypatch, create_test_user,
                                           arrange_ldap_auth):
     """Authenticate user with mocked LDAP, verify attributes are updated.
     """
     # Arrange test user.
     uniqifier = uuid.uuid4()
     username = 'test-user-{}'.format(uniqifier)
+    username = 'test-user-{0}'.format(uniqifier)
     assert User.get_by_username(username) is None
     user_input = dict(username='test-user-{}'.format(uniqifier),
+    user_input = dict(username='test-user-{0}'.format(uniqifier),
                       password='spam password',
                       email='spam-email-{}'.format(uniqifier),
+                      email='spam-email-{0}'.format(uniqifier),
                       firstname='spam first name',
                       lastname='spam last name',
                       active=True,
                       admin=False)
     user = create_test_user(user_input)
     # Arrange LDAP auth.
     monkeypatch.setattr(auth_ldap, 'AuthLdap', _AuthLdapMock)
     # Authenticate with LDAP.
     user_data = authenticate(username, 'password')
@@ @@ -61,25 +61,25 @@ def test_update_user_attributes_from_lda @@
     # retrieved from LDAP.
     assert user.firstname == 'spam ldap first name'
     assert user.lastname == 'spam ldap last name'
     assert user.email == 'spam ldap email'
 def test_init_user_attributes_from_ldap(monkeypatch, arrange_ldap_auth):
     """Authenticate unknown user with mocked LDAP, verify user is created.
     """
     # Arrange test user.
     uniqifier = uuid.uuid4()
     username = 'test-user-{}'.format(uniqifier)
+    username = 'test-user-{0}'.format(uniqifier)
     assert User.get_by_username(username) is None
     # Arrange LDAP auth.
     monkeypatch.setattr(auth_ldap, 'AuthLdap', _AuthLdapMock)
     # Authenticate with LDAP.
     user_data = authenticate(username, 'password')
     # Verify that authenication succeeded and retrieved correct attributes
     # from LDAP.
     assert user_data is not None
     assert user_data.get('firstname') == 'spam ldap first name'
@@ @@ -104,25 +104,25 @@ class _AuthLdapNoEmailMock(): @@
         return 'spam dn', dict(test_ldap_firstname=['spam ldap first name'],
                                test_ldap_lastname=['spam ldap last name'],
                                test_ldap_email=[''])
 def test_init_user_attributes_from_ldap_with_missing_email(monkeypatch,
                                                            arrange_ldap_auth):
     """Authenticate unknown user with mocked LDAP where email is missing.
     """
     # Arrange test user.
     uniqifier = uuid.uuid4()
     username = 'test-user-{}'.format(uniqifier)
+    username = 'test-user-{0}'.format(uniqifier)
     assert User.get_by_username(username) is None
     # Arrange LDAP auth.
     monkeypatch.setattr(auth_ldap, 'AuthLdap', _AuthLdapNoEmailMock)
     # Authenticate with LDAP.
     user_data = authenticate(username, 'password')
     # Verify that authenication succeeded and retrieved correct attributes
     # from LDAP, with empty email.
     assert user_data is not None
     assert user_data.get('firstname') == 'spam ldap first name'

0 comments (0 inline, 0 general)