Skip to content

adapt tests to the new paster app server #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

adapt tests to the new paster app server #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions test/integration_tests/test_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,43 @@
import requests
import json
import time
import logging

log = logging.getLogger(__name__)
sh = logging.StreamHandler()
log.addHandler(sh)
log.setLevel(logging.INFO)

import warnings

warnings.filterwarnings('ignore')

from nose.tools import with_setup
import pymongo
from bson.objectid import ObjectId

db = pymongo.MongoClient('mongodb://localhost/scitran').get_default_database()

base_url = 'https://localhost:8443/api'
db = pymongo.MongoClient('mongodb://localhost:9001/scitran').get_default_database()
adm_user = 'test@user.com'
base_url = 'http://localhost:8080/api'
test_data = type('',(object,),{})()

def setup_db():
global session
session = requests.Session()
session.params = {
'user': adm_user,
'root': True
}
test_data.group_id = 'test_group_' + str(int(time.time()*1000))
payload = {
'group': 'unknown',
'label': 'SciTran/Testing',
'_id': test_data.group_id
}
payload = json.dumps(payload)
r = session.post(base_url + '/groups', data=payload)
assert r.ok
payload = {
'group': test_data.group_id,
'label': 'test_project',
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/projects?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/projects', data=payload)
test_data.pid = json.loads(r.content)['_id']
assert r.ok
log.debug('pid = \'{}\''.format(test_data.pid))
Expand All @@ -38,7 +48,7 @@ def setup_db():
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/sessions?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/sessions', data=payload)
assert r.ok
test_data.sid = json.loads(r.content)['_id']
log.debug('sid = \'{}\''.format(test_data.sid))
Expand All @@ -49,32 +59,34 @@ def setup_db():
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/acquisitions?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/acquisitions', data=payload)
assert r.ok
test_data.aid = json.loads(r.content)['_id']
log.debug('aid = \'{}\''.format(test_data.aid))

def teardown_db():
r = requests.delete(base_url + '/acquisitions/' + test_data.aid + '?user=admin@user.com&root=true', verify=False)
session.params['root'] = True
r = session.delete(base_url + '/acquisitions/' + test_data.aid)
assert r.ok
r = requests.delete(base_url + '/sessions/' + test_data.sid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/sessions/' + test_data.sid)
assert r.ok
r = requests.delete(base_url + '/projects/' + test_data.pid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/projects/' + test_data.pid)
assert r.ok


@with_setup(setup_db, teardown_db)
def test_collections():
payload = {
'curator': 'admin@user.com',
'label': 'SciTran/Testing',
'public': True
'curator': adm_user,
'label': 'test_collection_'+ str(int(time.time())) ,
'public': False
}
r = requests.post(base_url + '/collections?user=admin@user.com', data=json.dumps(payload), verify=False)
session.params['root'] = False
r = session.post(base_url + '/collections', data=json.dumps(payload))
assert r.ok
_id = json.loads(r.content)['_id']
log.debug('_id = \'{}\''.format(_id))
r = requests.get(base_url + '/collections/' + _id + '?user=admin@user.com', verify=False)
r = session.get(base_url + '/collections/' + _id)
assert r.ok
payload = {
'contents':{
Expand All @@ -86,9 +98,9 @@ def test_collections():
'operation': 'add'
}
}
r = requests.put(base_url + '/collections/' + _id + '?user=admin@user.com', data=json.dumps(payload), verify=False)
r = session.put(base_url + '/collections/' + _id, data=json.dumps(payload))
assert r.ok
r = requests.get(base_url + '/collections/' + _id + '/acquisitions?session=' + test_data.sid + '&user=admin@user.com', verify=False)
r = session.get(base_url + '/collections/' + _id + '/acquisitions?session=' + test_data.sid)
assert r.ok
coll_acq_id= json.loads(r.content)[0]['_id']
assert coll_acq_id == test_data.aid
Expand All @@ -97,9 +109,9 @@ def test_collections():
for ac in acs:
assert len(ac['collections']) == 1
assert ac['collections'][0] == ObjectId(_id)
r = requests.delete(base_url + '/collections/' + _id + '?user=admin@user.com', verify=False)
r = session.delete(base_url + '/collections/' + _id)
assert r.ok
r = requests.get(base_url + '/collections/' + _id + '?user=admin@user.com', verify=False)
r = session.get(base_url + '/collections/' + _id)
assert r.status_code == 404
acs = db.acquisitions.find({'_id': {'$in': acq_ids}})
for ac in acs:
Expand Down
107 changes: 72 additions & 35 deletions test/integration_tests/test_containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,79 @@
import requests
import json
import time
from nose.tools import with_setup
import logging

log = logging.getLogger(__name__)
sh = logging.StreamHandler()
log.addHandler(sh)

requests.packages.urllib3.disable_warnings()
base_url = 'http://localhost:8080/api'
adm_user = 'test@user.com'
test_data = type('',(object,),{})()

def setup_db():
global session
session = requests.Session()
# all the requests will be performed as root
session.params = {
'user': adm_user,
'root': True
}

# Create a group
test_data.group_id = 'test_group_' + str(int(time.time()*1000))
payload = {
'_id': test_data.group_id
}
payload = json.dumps(payload)
r = session.post(base_url + '/groups', data=payload)
assert r.ok
test_data.group_id_1 = 'test_group_' + str(int(time.time()*1000))
payload = {
'_id': test_data.group_id_1
}
payload = json.dumps(payload)
r = session.post(base_url + '/groups', data=payload)
assert r.ok

base_url = 'https://localhost:8443/api'
def teardown_db():
r = session.delete(base_url + '/groups/' + test_data.group_id)
assert r.ok
r = session.delete(base_url + '/groups/' + test_data.group_id_1)
assert r.ok

@with_setup(setup_db, teardown_db)
def test_projects():
payload = {
'group': 'unknown',
'label': 'SciTran/Testing',
'group': test_data.group_id,
'label': 'test_project',
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/projects?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/projects', data=payload)
assert r.ok
_id = json.loads(r.content)['_id']
r = requests.get(base_url + '/projects/' + _id + '?user=admin@user.com&root=true', verify=False)
r = session.get(base_url + '/projects/' + _id)
assert r.ok
payload = {
'group': 'scitran',
'group': test_data.group_id_1,
}
payload = json.dumps(payload)
r = requests.put(base_url + '/projects/' + _id + '?user=admin@user.com&root=true', data=payload, verify=False)
r = session.put(base_url + '/projects/' + _id, data=payload)
assert r.ok
r = requests.delete(base_url + '/projects/' + _id + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/projects/' + _id)
assert r.ok

@with_setup(setup_db, teardown_db)
def test_sessions():
payload = {
'group': 'unknown',
'label': 'SciTran/Testing',
'group': test_data.group_id,
'label': 'test_project',
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/projects?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/projects', data=payload)
assert r.ok
pid = json.loads(r.content)['_id']
payload = {
Expand All @@ -46,43 +82,44 @@ def test_sessions():
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/sessions?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/sessions', data=payload)
assert r.ok
_id = json.loads(r.content)['_id']
r = requests.get(base_url + '/sessions/' + _id + '?user=admin@user.com&root=true', verify=False)
r = session.get(base_url + '/sessions/' + _id)
assert r.ok
payload = {
'group': 'unknown',
'label': 'SciTran/Testing 2',
'group': test_data.group_id,
'label': 'test_project_1',
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/projects?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/projects', data=payload)
new_pid = json.loads(r.content)['_id']
assert r.ok
payload = {
'project': new_pid,
}
payload = json.dumps(payload)
r = requests.put(base_url + '/sessions/' + _id + '?user=admin@user.com&root=true', data=payload, verify=False)
r = session.put(base_url + '/sessions/' + _id, data=payload)
assert r.ok
r = requests.delete(base_url + '/sessions/' + _id + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/sessions/' + _id)
assert r.ok
r = requests.get(base_url + '/sessions/' + _id + '?user=admin@user.com&root=true', verify=False)
r = session.get(base_url + '/sessions/' + _id)
assert r.status_code == 404
r = requests.delete(base_url + '/projects/' + pid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/projects/' + pid)
assert r.ok
r = requests.delete(base_url + '/projects/' + new_pid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/projects/' + new_pid)
assert r.ok

@with_setup(setup_db, teardown_db)
def test_acquisitions():
payload = {
'group': 'unknown',
'label': 'SciTran/Testing',
'group': test_data.group_id,
'label': 'test_project',
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/projects?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/projects', data=payload)
assert r.ok
pid = json.loads(r.content)['_id']
payload = {
Expand All @@ -91,7 +128,7 @@ def test_acquisitions():
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/sessions?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/sessions', data=payload)
assert r.ok
sid = json.loads(r.content)['_id']

Expand All @@ -101,7 +138,7 @@ def test_acquisitions():
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/sessions?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/sessions', data=payload)
assert r.ok
new_sid = json.loads(r.content)['_id']

Expand All @@ -111,27 +148,27 @@ def test_acquisitions():
'public': False
}
payload = json.dumps(payload)
r = requests.post(base_url + '/acquisitions?user=admin@user.com&root=true', data=payload, verify=False)
r = session.post(base_url + '/acquisitions', data=payload)
assert r.ok
aid = json.loads(r.content)['_id']

r = requests.get(base_url + '/acquisitions/' + aid + '?user=admin@user.com&root=true', verify=False)
r = session.get(base_url + '/acquisitions/' + aid)
assert r.ok

payload = {
'session': new_sid
}
payload = json.dumps(payload)
r = requests.put(base_url + '/acquisitions/' + aid + '?user=admin@user.com&root=true', data=payload, verify=False)
r = session.put(base_url + '/acquisitions/' + aid, data=payload)
assert r.ok

r = requests.delete(base_url + '/acquisitions/' + aid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/acquisitions/' + aid)
assert r.ok
r = requests.get(base_url + '/acquisitions/' + aid + '?user=admin@user.com&root=true', verify=False)
r = session.get(base_url + '/acquisitions/' + aid)
assert r.status_code == 404
r = requests.delete(base_url + '/sessions/' + sid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/sessions/' + sid)
assert r.ok
r = requests.delete(base_url + '/sessions/' + new_sid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/sessions/' + new_sid)
assert r.ok
r = requests.delete(base_url + '/projects/' + pid + '?user=admin@user.com&root=true', verify=False)
r = session.delete(base_url + '/projects/' + pid)
assert r.ok
Loading