kallithea Changeset - 4a4e4a498518

Changeset - 4a4e4a498518

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich - 6 years ago 2020-04-30 13:46:56
mads@kiilerich.com

tests: fix test_auth_ldap dependency on test order to avoid failure on uniqueness constraint

It would perhaps be even better to have each test clean up ... but let's only
aim for only avoiding collision on leaked test data.

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

@@ @@ -21,13 +21,13 @@ class _AuthLdapMock(): @@
     def __init__(self, **kwargs):
         pass
     def authenticate_ldap(self, username, password):
         return 'spam dn', dict(test_ldap_firstname=['spam ldap first name'],
                                test_ldap_lastname=['spam ldap last name'],
-                               test_ldap_email=['spam ldap email'])
+                               test_ldap_email=['%s ldap email' % username])
 def test_update_user_attributes_from_ldap(monkeypatch, create_test_user,
                                           arrange_ldap_auth):
     """Authenticate user with mocked LDAP, verify attributes are updated.
     """
@@ @@ -53,19 +53,19 @@ def test_update_user_attributes_from_lda @@
     # 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'
     assert user_data.get('lastname') == 'spam ldap last name'
-    assert user_data.get('email') == 'spam ldap email'
+    assert user_data.get('email') == '%s ldap email' % username
     # Verify that authentication overwrote user attributes with the ones
     # retrieved from LDAP.
     assert user.firstname == 'spam ldap first name'
     assert user.lastname == 'spam ldap last name'
-    assert user.email == 'spam ldap email'
+    assert user.email == '%s ldap email' % username
 def test_init_user_attributes_from_ldap(monkeypatch, arrange_ldap_auth):
     """Authenticate unknown user with mocked LDAP, verify user is created.
     """
@@ @@ -82,21 +82,21 @@ def test_init_user_attributes_from_ldap( @@
     # 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'
     assert user_data.get('lastname') == 'spam ldap last name'
-    assert user_data.get('email') == 'spam ldap email'
+    assert user_data.get('email') == '%s ldap email' % username
     # Verify that authentication created new user with attributes
     # retrieved from LDAP.
     new_user = User.get_by_username(username)
     assert new_user is not None
     assert new_user.firstname == 'spam ldap first name'
     assert new_user.lastname == 'spam ldap last name'
-    assert new_user.email == 'spam ldap email'
+    assert new_user.email == '%s ldap email' % username
 class _AuthLdapNoEmailMock():
     def __init__(self, **kwargs):
         pass

0 comments (0 inline, 0 general)