Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flamenco-worker-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
flamenco-worker-python
Commits
ca72d92c
Commit
ca72d92c
authored
Jan 10, 2019
by
Sybren A. Stüvel
Browse files
Options
Downloads
Patches
Plain Diff
Some Windows-specific unit test fixes
parent
f1576792
No related branches found
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test_commands_blender_render.py
+9
-8
9 additions, 8 deletions
tests/test_commands_blender_render.py
tests/test_worker.py
+1
-1
1 addition, 1 deletion
tests/test_worker.py
with
10 additions
and
9 deletions
tests/test_commands_blender_render.py
+
9
−
8
View file @
ca72d92c
...
...
@@ -9,6 +9,7 @@ from tests.test_runner import AbstractCommandTest
class
BlenderRenderTest
(
AbstractCommandTest
):
thisfile
=
Path
(
__file__
).
as_posix
()
def
setUp
(
self
):
super
().
setUp
()
...
...
@@ -90,7 +91,7 @@ class BlenderRenderTest(AbstractCommandTest):
filepath
=
str
(
Path
(
__file__
).
parent
)
settings
=
{
# Point blender_cmd to this file so that we're sure it exists.
'
blender_cmd
'
:
'
%s
--with --cli=
"
args for CLI
"'
%
__file__
,
'
blender_cmd
'
:
f
'
{
self
.
thisfile
!r}
--with --cli=
"
args for CLI
"'
,
'
chunk_size
'
:
100
,
'
frames
'
:
'
1..2
'
,
'
format
'
:
'
JPEG
'
,
...
...
@@ -104,7 +105,7 @@ class BlenderRenderTest(AbstractCommandTest):
self
.
loop
.
run_until_complete
(
self
.
cmd
.
run
(
settings
))
mock_cse
.
assert_called_once_with
(
__
file
__
,
self
.
this
file
,
'
--with
'
,
'
--cli=args for CLI
'
,
'
--enable-autoexec
'
,
...
...
@@ -124,7 +125,7 @@ class BlenderRenderTest(AbstractCommandTest):
filepath
=
str
(
Path
(
__file__
).
parent
)
settings
=
{
# Point blender_cmd to this file so that we're sure it exists.
'
blender_cmd
'
:
'
%s
--with --cli=
"
args for CLI
"'
%
__file__
,
'
blender_cmd
'
:
f
'
{
self
.
thisfile
!r}
--with --cli=
"
args for CLI
"'
,
'
python_expr
'
:
'
print(
"
yay in
\'
quotes
\'
"
)
'
,
'
chunk_size
'
:
100
,
'
frames
'
:
'
1..2
'
,
...
...
@@ -168,11 +169,11 @@ class BlenderRenderTest(AbstractCommandTest):
settings
=
{
# Point blender_cmd to this file so that we're sure it exists.
'
blender_cmd
'
:
__
file
__
,
'
blender_cmd
'
:
self
.
this
file
,
'
chunk_size
'
:
100
,
'
frames
'
:
'
1..2
'
,
'
format
'
:
'
JPEG
'
,
'
filepath
'
:
str
(
blendpath
),
'
filepath
'
:
blendpath
.
as_posix
(
),
}
cse
=
CoroMock
(...)
...
...
@@ -182,13 +183,13 @@ class BlenderRenderTest(AbstractCommandTest):
self
.
loop
.
run_until_complete
(
self
.
cmd
.
run
(
settings
))
mock_cse
.
assert_called_once_with
(
__
file
__
,
self
.
this
file
,
'
--enable-autoexec
'
,
'
-noaudio
'
,
'
--background
'
,
str
(
blendpath
),
blendpath
.
as_posix
(
),
'
--python-exit-code
'
,
'
42
'
,
'
--python
'
,
str
(
override
),
'
--python
'
,
override
.
as_posix
(
),
'
--render-format
'
,
'
JPEG
'
,
'
--render-frame
'
,
'
1..2
'
,
stdin
=
subprocess
.
DEVNULL
,
...
...
This diff is collapsed.
Click to expand it.
tests/test_worker.py
+
1
−
1
View file @
ca72d92c
...
...
@@ -323,7 +323,7 @@ class TestWorkerTaskExecution(AbstractFWorkerTest):
self
.
assertTrue
(
stop_called
)
self
.
manager
.
post
.
assert_called_once_with
(
'
/task
'
,
loop
=
self
.
asyncio_loop
)
self
.
manager
.
post
.
assert_called_once_with
(
'
/task
'
,
loop
=
unittest
.
mock
.
ANY
)
self
.
tuqueue
.
queue
.
assert_any_call
(
'
/tasks/58514d1e9837734f2e71b479/update
'
,
{
'
task_progress_percentage
'
:
0
,
'
activity
'
:
''
,
...
...
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