Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frms
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
saxid-federated-resource-management
frms
Commits
540f0e95
Commit
540f0e95
authored
Aug 01, 2019
by
Daniel Schreiber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Python3 fix
Test dazu
parent
c53537ec
Pipeline
#27489
passed with stage
in 21 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
1 deletion
+57
-1
api/tests/test_queue.py
api/tests/test_queue.py
+56
-0
api/utils/queue_utils.py
api/utils/queue_utils.py
+1
-1
No files found.
api/tests/test_queue.py
0 → 100644
View file @
540f0e95
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from
__future__
import
division
,
print_function
,
unicode_literals
import
requests_mock
from
django.test
import
TestCase
from
rest_framework.test
import
APITestCase
from
api.models
import
Attribute
,
QueueJob
,
QueueJobStatus
,
QueueJobType
,
Resource
,
ServiceProvider
,
TokenAuthUser
,
UserType
from
api.utils
import
queue_utils
import
json
import
six
class
ResourceQueueSyncTest
(
APITestCase
):
def
test_remote_answers_with_400
(
self
):
with
requests_mock
.
Mocker
()
as
m
:
pass
class
DispatchRessourceSyncTest
(
TestCase
):
def
test_resource
(
self
):
self
.
assertEqual
(
QueueJob
.
objects
.
count
(),
0
)
remote_realm
=
'foo.bar'
remote_user
=
TokenAuthUser
(
user_type
=
UserType
.
TYPE_SYNC
,
username
=
'foobar'
,
realm
=
remote_realm
,
api_url
=
'https://remote.example.org/api'
)
remote_user
.
set_unusable_password
()
remote_user
.
full_clean
()
remote_user
.
save
()
sp
=
ServiceProvider
(
realm
=
remote_realm
,
name
=
"foo2"
,
expiry_date
=
'2099-01-01'
)
sp
.
full_clean
()
sp
.
save
()
r
=
Resource
(
sp
=
sp
,
eppn
=
'user@foo.bar'
,
expiry_date
=
'2016-01-01 00:00:00'
,
deletion_date
=
'2017-01-01 00:00:00'
,
setup_token
=
'1234'
)
r
.
full_clean
()
r
.
save
()
att
=
Attribute
(
resource
=
r
,
name
=
"foo"
,
value
=
"1234"
)
att
.
full_clean
()
att
.
save
()
att2
=
Attribute
(
resource
=
r
,
name
=
"bar"
,
value
=
"5678"
)
att2
.
full_clean
()
att2
.
save
()
queue_utils
.
dispatch_resource_sync
(
r
)
self
.
assertEqual
(
QueueJob
.
objects
.
count
(),
1
)
qj
=
QueueJob
.
objects
.
first
()
self
.
assertEqual
(
qj
.
status
,
QueueJobStatus
.
STATUS_READY
)
self
.
assertEqual
(
qj
.
type
,
QueueJobType
.
TYPE_RES
)
object_data
=
json
.
loads
(
qj
.
obj
)
self
.
assertEqual
(
object_data
[
'uuid'
],
six
.
text_type
(
r
.
pk
))
self
.
assertEqual
(
object_data
[
'realm_idp'
],
r
.
realm_idp
)
self
.
assertEqual
(
object_data
[
'eppn'
],
r
.
eppn
)
self
.
assertEqual
(
object_data
[
'sp'
],
six
.
text_type
(
r
.
sp
.
pk
))
self
.
assertEqual
(
len
(
object_data
[
'attributes'
]),
2
)
for
a
in
(
att
,
att2
):
self
.
assertTrue
({
'default_value'
:
''
,
'name'
:
a
.
name
,
'value'
:
a
.
value
,
'vec_idp'
:
a
.
vec_idp
,
'vec_sp'
:
a
.
vec_sp
}
in
object_data
[
'attributes'
])
print
(
object_data
)
api/utils/queue_utils.py
View file @
540f0e95
...
...
@@ -22,7 +22,7 @@ class SyncException(Exception):
def
dispatch_resource_sync
(
resource
):
json
=
JSONRenderer
().
render
(
ResourceSerializer
(
resource
).
data
)
json
=
JSONRenderer
().
render
(
ResourceSerializer
(
resource
).
data
)
.
decode
(
"utf-8"
)
# Remote URL can be inferred by the resource's ePPN FQDN-part minus any sub-domains
dest_realm
=
extract_idp
(
resource
.
eppn
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment