Skip to content

Commit 858edc5

Browse files
committed
Add additional unit tests for the peers_prefilter helper from PR #321.
Cleaned up a bit in PR #326 code to remove debug messages and to sync.
1 parent a2791cf commit 858edc5

File tree

1 file changed

+31
-9
lines changed

1 file changed

+31
-9
lines changed

tests/test_mig_shared_accountreq.py

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,27 +143,49 @@ def test_peer_acceptance(self):
143143
self.assertTrue(success)
144144

145145
def test_signup_prefilter_email_accept(self):
146-
accept = ['john@doe.org', 'a@b.c.org', 'a@ku.dk.com', 'a@sci.ku.dk.org',
147-
'a@diku.dk', 'a@nbi.dk']
146+
accept = ['john@doe.org', 'a@b.c.org', 'a@ku.dk.com',
147+
'a@sci.ku.dk.org', 'a@diku.dk', 'a@nbi.dk']
148148
self.configuration.site_signup_prefilter = [
149149
('email', r'^.+(?<!(@|\.)ku\.dk)$')]
150150
for addr in accept:
151151
user = {'email': addr}
152-
check = accountreq.signup_prefilter_allowed(
153-
self.configuration, user)
154-
print("check %r: %s" % (addr, check))
152+
check = accountreq.signup_prefilter_allowed(self.configuration,
153+
user)
155154
self.assertTrue(check)
156155

157156
def test_signup_prefilter_email_reject(self):
158-
reject = ['john.doe@science.ku.dk',
159-
'abc123@ku.dk', 'john.doe@a.b.c.ku.dk']
157+
reject = ['john.doe@science.ku.dk', 'abc123@ku.dk',
158+
'john.doe@a.b.c.ku.dk']
160159
self.configuration.site_signup_prefilter = [
161160
('email', r'.+(?<!(@|\.)ku\.dk)$')]
162161
for addr in reject:
163162
user = {'email': addr}
164-
check = accountreq.signup_prefilter_allowed(
165-
self.configuration, user)
163+
check = accountreq.signup_prefilter_allowed(self.configuration,
164+
user)
165+
self.assertFalse(check)
166+
166167
print("check %r: %s" % (addr, check))
168+
169+
def test_peers_prefilter_email_accept(self):
170+
accept = ['john.doe@science.ku.dk', 'abc123@ku.dk',
171+
'john.doe@a.b.c.ku.dk']
172+
self.configuration.site_peers_prefilter = [
173+
('peers_email', r'^.+@([a-z0-9]+\.)*ku\.dk$')]
174+
for addr in accept:
175+
user = {'peers_email': addr}
176+
check = accountreq.peers_prefilter_allowed(self.configuration,
177+
user)
178+
self.assertTrue(check)
179+
180+
def test_signup_prefilter_email_reject(self):
181+
reject = ['john@doe.org', 'a@b.c.org', 'a@ku.dk.com',
182+
'a@sci.ku.dk.org']
183+
self.configuration.site_peers_prefilter = [
184+
('peers_email', r'^.+@([a-z0-9]+\.)*ku\.dk$')]
185+
for addr in reject:
186+
user = {'peers_email': addr}
187+
check = accountreq.peers_prefilter_allowed(self.configuration,
188+
user)
167189
self.assertFalse(check)
168190

169191

0 commit comments

Comments
 (0)