Revision a248ebbb
b/snf-astakos-app/astakos/im/tests/api.py | ||
---|---|---|
40 | 40 |
|
41 | 41 |
import json |
42 | 42 |
|
43 |
ROOT = "/%s/%s/" % ( |
|
44 |
astakos_settings.BASE_PATH, astakos_settings.ACCOUNTS_PREFIX) |
|
43 |
ROOT = "/%s/%s/%s/" % (
|
|
44 |
astakos_settings.BASE_PATH, astakos_settings.ACCOUNTS_PREFIX, 'v1.0')
|
|
45 | 45 |
u = lambda url: ROOT + url |
46 | 46 |
|
47 | 47 |
|
... | ... | |
55 | 55 |
resource11 = {"name": "service1.resource11", |
56 | 56 |
"desc": "resource11 desc", |
57 | 57 |
"service_type": "type1", |
58 |
"service_origin": "service1", |
|
58 | 59 |
"allow_in_projects": True} |
59 | 60 |
r, _ = register.add_resource(resource11) |
60 | 61 |
register.update_resource(r, 100) |
61 | 62 |
resource12 = {"name": "service1.resource12", |
62 | 63 |
"desc": "resource11 desc", |
63 | 64 |
"service_type": "type1", |
65 |
"service_origin": "service1", |
|
64 | 66 |
"unit": "bytes"} |
65 | 67 |
r, _ = register.add_resource(resource12) |
66 | 68 |
register.update_resource(r, 1024) |
... | ... | |
75 | 77 |
resource21 = {"name": "service2.resource21", |
76 | 78 |
"desc": "resource11 desc", |
77 | 79 |
"service_type": "type2", |
80 |
"service_origin": "service2", |
|
78 | 81 |
"allow_in_projects": False} |
79 | 82 |
r, _ = register.add_resource(resource21) |
80 | 83 |
register.update_resource(r, 3) |
b/snf-astakos-app/astakos/im/tests/auth.py | ||
---|---|---|
58 | 58 |
# eepn required |
59 | 59 |
r = client.get(ui_url('login/shibboleth?'), follow=True) |
60 | 60 |
self.assertContains(r, messages.SHIBBOLETH_MISSING_EPPN % { |
61 |
'domain': astakos_settings.BASE_URL,
|
|
61 |
'domain': astakos_settings.BASE_HOST,
|
|
62 | 62 |
'contact_email': settings.CONTACT_EMAIL |
63 | 63 |
}) |
64 | 64 |
client.set_tokens(eppn="kpapeppn") |
Also available in: Unified diff