Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Commits
a4aa76dd
Commit
a4aa76dd
authored
3 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
users and workers are created lazily on demand to improve performance
parent
eb249e48
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!357
Speed up tests
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
smash/web/tests/__init__.py
+28
-15
28 additions, 15 deletions
smash/web/tests/__init__.py
smash/web/tests/view/test_worker.py
+6
-6
6 additions, 6 deletions
smash/web/tests/view/test_worker.py
with
34 additions
and
21 deletions
smash/web/tests/__init__.py
+
28
−
15
View file @
a4aa76dd
...
...
@@ -22,21 +22,13 @@ logger = logging.getLogger(__name__)
class
LoggedInTestCase
(
TestCase
):
_super_worker
:
Worker
=
None
_admin_worker
:
Worker
=
None
_staff_worker
:
Worker
=
None
def
setUp
(
self
):
self
.
password
=
'
passwd1234
'
# superuser
self
.
super_worker
=
create_worker
(
user
=
get_user_model
().
objects
.
create_superuser
(
username
=
'
super
'
,
password
=
self
.
password
,
email
=
'
a@mail.com
'
))
# admin
self
.
admin_worker
=
Worker
.
get_by_user
(
create_user
(
username
=
'
admin
'
,
password
=
self
.
password
))
add_permissions_to_worker
(
self
.
admin_worker
,
PermissionDecorator
.
codenames
)
# staff
self
.
staff_worker
=
Worker
.
get_by_user
(
create_user
(
username
=
'
staff
'
,
password
=
self
.
password
))
username
=
'
piotr
'
password
=
'
top_secret
'
self
.
user
=
get_user_model
().
objects
.
create_user
(
username
=
username
,
email
=
'
jacob@bla
'
,
password
=
password
)
...
...
@@ -45,14 +37,35 @@ class LoggedInTestCase(TestCase):
self
.
client
=
Client
()
self
.
client
.
login
(
username
=
username
,
password
=
password
)
@property
def
super_worker
(
self
)
->
Worker
:
if
self
.
_super_worker
is
None
:
self
.
_super_worker
=
create_worker
(
user
=
get_user_model
().
objects
.
create_superuser
(
username
=
'
super
'
,
password
=
self
.
password
,
email
=
'
a@mail.com
'
))
return
self
.
_super_worker
@property
def
admin_worker
(
self
)
->
Worker
:
if
self
.
_admin_worker
is
None
:
self
.
_admin_worker
=
Worker
.
get_by_user
(
create_user
(
username
=
'
admin
'
,
password
=
self
.
password
))
add_permissions_to_worker
(
self
.
_admin_worker
,
PermissionDecorator
.
codenames
)
return
self
.
_admin_worker
@property
def
staff_worker
(
self
)
->
Worker
:
if
self
.
_staff_worker
is
None
:
self
.
_staff_worker
=
Worker
.
get_by_user
(
create_user
(
username
=
'
staff
'
,
password
=
self
.
password
))
return
self
.
_staff_worker
def
login_as_staff
(
self
):
self
.
client
.
logout
()
self
.
client
.
login
(
username
=
'
staff
'
,
password
=
self
.
password
)
self
.
client
.
login
(
username
=
self
.
staff_worker
.
user
.
username
,
password
=
self
.
password
)
def
login_as_admin
(
self
):
self
.
client
.
logout
()
self
.
client
.
login
(
username
=
'
admin
'
,
password
=
self
.
password
)
self
.
client
.
login
(
username
=
self
.
admin_worker
.
user
.
username
,
password
=
self
.
password
)
def
login_as_super
(
self
):
self
.
client
.
logout
()
self
.
client
.
login
(
username
=
'
super
'
,
password
=
self
.
password
)
self
.
client
.
login
(
username
=
self
.
super_worker
.
user
.
username
,
password
=
self
.
password
)
This diff is collapsed.
Click to expand it.
smash/web/tests/view/test_worker.py
+
6
−
6
View file @
a4aa76dd
import
logging
from
django.urls
import
reverse
from
django.contrib.auth
import
get_user_model
from
django.urls
import
reverse
from
web.forms
import
WorkerForm
from
web.models
import
Worker
...
...
@@ -72,11 +72,11 @@ class WorkerViewTests(LoggedInTestCase):
self
.
assertEqual
(
response
.
status_code
,
200
)
def
test_render_worker_added_request
(
self
):
self
.
assertEqual
(
4
,
Worker
.
objects
.
all
().
count
())
self
.
assertEqual
(
4
,
get_user_model
().
objects
.
all
().
count
())
self
.
login_as_admin
()
worker_count
=
Worker
.
objects
.
all
().
count
()
user_count
=
get_user_model
().
objects
.
all
().
count
()
language
=
create_language
()
location
=
create_location
()
...
...
@@ -87,8 +87,8 @@ class WorkerViewTests(LoggedInTestCase):
self
.
assertEqual
(
response
.
status_code
,
302
)
self
.
assertEqual
(
5
,
Worker
.
objects
.
all
().
count
())
self
.
assertEqual
(
5
,
get_user_model
().
objects
.
all
().
count
())
self
.
assertEqual
(
worker_count
+
1
,
Worker
.
objects
.
all
().
count
())
self
.
assertEqual
(
user_count
+
1
,
get_user_model
().
objects
.
all
().
count
())
def
create_add_worker_form_data
(
self
,
language
,
location
):
form_data
=
self
.
get_form_data
(
Worker
())
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment