blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: fix tests for recent change from filepath to blendfile setting

Browse Source 
4196460c29a607e1d3d2d052bf2bf546d5c05616 changed the name of the job
setting used to communicate the input blend file path, but the tests
weren't updated for this.
This commit is contained in:
Sybren A. Stüvel 2022-03-15 10:46:58 +01:00
parent 04ac003ed6
commit 4e570d601c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/manager/job_compilers/job_compilers_test.go
View File

@ -19,9 +19,9 @@ func exampleSubmittedJob() api.SubmittedJob {
settings := api.JobSettings{ settings := api.JobSettings{
AdditionalProperties: map[string]interface{}{ AdditionalProperties: map[string]interface{}{
"blender_cmd": "{blender}", "blender_cmd": "{blender}",
"blendfile": "/render/sf/jobs/scene123.blend",
"chunk_size": 3, "chunk_size": 3,
"extract_audio": true, "extract_audio": true,
"filepath": "/render/sf/jobs/scene123.blend",
"format": "PNG", "format": "PNG",
"fps": 24, "fps": 24,
"frames": "1-10", "frames": "1-10",
@ -95,7 +95,7 @@ func TestSimpleBlenderRenderHappy(t *testing.T) {
assert.Equal(t, "blender-render", t0.Commands[0].Name) assert.Equal(t, "blender-render", t0.Commands[0].Name)
assert.EqualValues(t, AuthoredCommandParameters{ assert.EqualValues(t, AuthoredCommandParameters{
"exe": "{blender}", "exe": "{blender}",
"blendfile": settings["filepath"].(string), "blendfile": settings["blendfile"].(string),
"args": expectCliArgs, "args": expectCliArgs,
"argsBefore": make([]interface{}, 0), "argsBefore": make([]interface{}, 0),
}, t0.Commands[0].Parameters) }, t0.Commands[0].Parameters)
@ -142,7 +142,7 @@ func TestSimpleBlenderRenderWindowsPaths(t *testing.T) {
sj := exampleSubmittedJob() sj := exampleSubmittedJob()
// Adjust the job to get paths in Windows notation. // Adjust the job to get paths in Windows notation.
sj.Settings.AdditionalProperties["filepath"] = "R:\\sf\\jobs\\scene123.blend" sj.Settings.AdditionalProperties["blendfile"] = "R:\\sf\\jobs\\scene123.blend"
sj.Settings.AdditionalProperties["render_output"] = "R:\\sprites\\farm_output\\promo\\square_ellie\\square_ellie.lighting_light_breakdown2\\######" sj.Settings.AdditionalProperties["render_output"] = "R:\\sprites\\farm_output\\promo\\square_ellie\\square_ellie.lighting_light_breakdown2\\######"
aj, err := s.Compile(ctx, sj) aj, err := s.Compile(ctx, sj)