Commit Graph

218 Commits

Author SHA1 Message Date
Omar Richardson
662017f260 Refactored scope module. Implemented filter in *ListApiHandlers 2021-01-05 11:42:53 +01:00
IvanaH8
5e8864f29d fixed default roles for mocked services 2020-12-18 15:04:14 +01:00
0mar
6ad757f7e7 Merge remote-tracking branch 'upstream/rbac' into merge_api_with_orm 2020-12-17 09:22:44 +01:00
0mar
f10fc0f0c0 No more need for mock roles 2020-12-16 14:46:08 +01:00
IvanaH8
8a7320b318 fixed default roles for mocked services 2020-12-16 11:17:43 +01:00
0mar
3eccf7abdd Changed scopes from list to set and made filters additive 2020-12-14 17:39:06 +01:00
0mar
e47d96e016 Merge remote-tracking branch 'upstream/rbac' into merge_api_with_orm 2020-12-09 15:24:48 +01:00
0mar
4ab2e3aa0a Fixed merge request after cherrypick 2020-12-09 12:25:33 +01:00
Ivana
f9a3eec147 Merge branch 'rbac' into implementing-default-roles 2020-12-08 08:41:04 +01:00
Min RK
f8040209b0 allow services to call /api/user to identify themselves 2020-12-02 12:21:25 +01:00
Min RK
6fc3dc4c01 Merge master into rbac 2020-12-02 11:28:53 +01:00
Min RK
ba6c2cf854 Merge pull request #3266 from 0mar/reduce_ssl_testing
Test internal_ssl separately
2020-12-02 10:59:39 +01:00
Min RK
28fdbeb0c0 update back pre-commit hook
specify minimum target_version as py36

results in some churn
2020-11-30 10:13:10 +01:00
Omar Richardson
0472ef0533 Central internal_ssl switch 2020-11-20 15:27:50 +01:00
Erik Sundell
202efae6d8 Merge pull request #3177 from minrk/user-state-filter
add ?state= filter for GET /users
2020-11-20 11:06:15 +01:00
Omar Richardson
313f050c42 Reduced ssl on for active tests only 2020-11-19 12:58:38 +01:00
Omar Richardson
71d99e1180 Update with expand group test 2020-11-19 09:57:50 +01:00
IvanaH8
c0cadc384d adding roles to tokens 2020-11-19 08:22:52 +01:00
Erik Sundell
5edd246474 Replace @async_generator/yeild_ with async/yeild 2020-11-11 14:47:29 +01:00
Erik Sundell
77ed2faf31 Replace gen.multi(futures) with asyncio.gather(*futures) 2020-11-11 14:47:24 +01:00
Erik Sundell
4a17441e5a Replace gen.sleep with asyncio.sleep 2020-11-11 14:40:59 +01:00
Erik Sundell
e1166ec834 Replace @gen.coroutine/yield with async/await 2020-11-11 14:36:56 +01:00
0mar
496832d7b4 Adjusted tests to allow for scopes 2020-10-30 15:06:48 +01:00
0mar
e26fa682c1 Implemented mock scopes in tests and fixed scopes 2020-10-28 17:45:58 +01:00
IvanaH8
087c763d41 adding roles to services 2020-10-28 11:16:03 +01:00
IvanaH8
4142dc1bc0 update to roles utils 2020-10-21 16:36:50 +02:00
IvanaH8
f1ed74bae1 creating roles module 2020-10-19 19:57:55 +02:00
Erik Sundell
4cbc0bad34 Merge branch 'master' into remove-unused-imports 2020-10-01 12:07:37 +02:00
Min RK
30b8bc3664 add ?state= filter for GET /users
allows selecting users based on the 'ready' 'active' or 'inactive' states of their servers

- ready: users who have any servers in the 'ready' state
- active: users who have any servers in the 'active' state (i.e. ready OR pending)
- inactive: users who have *no* servers in the 'active' state (inactive + active = all users, no overlap)

Does not change the user model, so a user with *any* ready servers will still return all their servers
2020-09-17 12:31:16 +02:00
Rollin Thomas
46ead8cd9d Add display variable to tests 2020-08-26 21:43:16 -07:00
Steffen Vogel
e93cc83d58 remove unused imports 2020-04-16 12:12:22 +02:00
Min RK
ddc852d658 persist user_options
remember user_options from the previous run

this allows user options set via spawn form to be re-used when restarting e.g. a named server via the api
2019-02-28 14:27:47 +01:00
Min RK
5e60582ef3 run autoformat
apologies to anyone finding this commit via git blame or log

run the autoformatting by

    pre-commit run --all-files
2019-02-19 17:00:10 +01:00
Min RK
370ec4f5c7 remove unused sp
we need to ensure the spawners exist,
but we do that when we set last_activity
2019-02-14 16:01:51 +01:00
Min RK
d8d1b6c149 test activity api 2019-02-11 16:17:23 +01:00
Min RK
96c16bfb85 missing escape in normalize_timestamp 2019-02-04 12:56:53 +01:00
Min RK
8c63f669a9 consolidate some test utilities in utils
instead of in test_api, test_pages

since they are used in a few places

also add user, username fixtures for generating test users
2019-01-04 11:03:20 +01:00
Min RK
7b154fcc45 Merge branch 'master' into master 2018-12-14 10:51:47 +01:00
Min RK
37cdba370f update tests for pytest-asyncio
- remove gen_test marker
- use async def
- find/replace yield->await approximately one million times
2018-12-12 13:06:10 +01:00
Min RK
47e66580db Don’t mix no_patience and bad_spawn
this introduces a race between the early RuntimeError being tested
and the no_patience causing handlers to return early if async start isn’t complete.

With tornado coroutines, an early RuntimeError could be guaranteed to resolve promptly, but asyncio isn’t as consistent,
possibly causing some of the recent flaky tests.
2018-12-04 15:02:53 +01:00
Gerhard Weis
9ac6ed344c UserTokenListAPIHandler should support Authenticator.authenticate returning a dict 2018-11-22 14:33:48 +10:00
Min RK
28c6377db7 avoid modifying headers in-place
can have consequences if args are re-used
2018-10-12 17:05:59 +02:00
Thomas Mendoza
dd07495624 Fix public_url call with ssl testing enabled 2018-10-05 15:59:10 -07:00
Min RK
f29354e0f4 Merge branch 'master' into end-to-end-ssl 2018-10-02 11:15:53 +02:00
Thomas Mendoza
2cd6a9e720 Supply certs to individual async_requests 2018-10-01 16:48:03 -07:00
Thomas Mendoza
99f2905cab Use certs if available for test_api 2018-10-01 16:48:03 -07:00
Min RK
e79b43e906 support removing named servers 2018-09-24 16:21:40 +02:00
Min RK
58f005eea2 Fix content-type on API endpoints
and includes content-type header checks in tests to catch regressions
2018-09-21 15:12:53 +02:00
Min RK
06f646099f token expiry fixes
typos in token expiry:

- omitted from token model (it's in the spec in docs, but wasn't in the model)
- wrong type when sorting oauth tokens on token page could cause token page to not render
2018-09-11 08:54:12 +02:00
Min RK
dcae92ce4a test passing url params to spawner 2018-09-03 09:56:42 +02:00