Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
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
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
1be8f0c3
Commit
1be8f0c3
authored
3 years ago
by
Charlotte Hausman
Browse files
Options
Downloads
Patches
Plain Diff
fixing tests
parent
230abb13
Loading
Loading
1 merge request
!512
submit to naasc as almapipe
Pipeline
#2932
passed
3 years ago
Stage: cache-build
Stage: build
Stage: unit-test
Stage: test-coverage
Stage: e2e-test
Stage: .post
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
shared/workspaces/test/test_workflow_service.py
+8
-8
8 additions, 8 deletions
shared/workspaces/test/test_workflow_service.py
with
8 additions
and
8 deletions
shared/workspaces/test/test_workflow_service.py
+
8
−
8
View file @
1be8f0c3
...
...
@@ -189,8 +189,8 @@ class TestWorkflowService:
mock_workflow_service
.
_submit_dag
=
MagicMock
()
# Test DAG submission
mock_workflow_service
.
_execute_prepared
(
fake_folder
)
mock_workflow_service
.
_submit_dag
.
assert_called_with
(
fake_folder
,
fake_dagfile
)
mock_workflow_service
.
_execute_prepared
(
fake_folder
,
False
)
mock_workflow_service
.
_submit_dag
.
assert_called_with
(
fake_folder
,
fake_dagfile
,
False
)
# DAG cleanup
mock_workflow_service
.
_submit_dag
=
orig_submit_dag
...
...
@@ -204,8 +204,8 @@ class TestWorkflowService:
mock_workflow_service
.
_submit_job
=
MagicMock
()
# Test job submission
mock_workflow_service
.
_execute_prepared
(
fake_folder
)
mock_workflow_service
.
_submit_job
.
assert_called_with
(
fake_folder
,
fake_jobfile
)
mock_workflow_service
.
_execute_prepared
(
fake_folder
,
False
)
mock_workflow_service
.
_submit_job
.
assert_called_with
(
fake_folder
,
fake_jobfile
,
False
)
# Cleanup
mock_workflow_service
.
_submit_job
=
orig_submit_job
...
...
@@ -216,11 +216,11 @@ class TestWorkflowService:
fake_jobfile
=
pathlib
.
Path
(
"
fake.submit
"
)
fake_jobfile
.
touch
()
with
patch
(
"
workspaces.workflow.services.workflow_service.subprocess.run
"
)
as
mock_sp_run
:
log_path
=
mock_workflow_service
.
_submit_job
(
fake_folder
,
fake_jobfile
)
log_path
=
mock_workflow_service
.
_submit_job
(
fake_folder
,
fake_jobfile
,
False
)
mock_sp_run
.
assert_called_with
(
[
"
condor_submit
"
,
fake_jobfile
.
name
],
cwd
=
str
(
fake_folder
.
absolute
()),
preexec_fn
=
mock_workflow_service
.
_switch_to_submituser
,
preexec_fn
=
mock_workflow_service
.
_switch_to_submituser
(
False
)
,
)
assert
log_path
.
name
==
"
fake.log
"
...
...
@@ -230,11 +230,11 @@ class TestWorkflowService:
fake_folder
=
pathlib
.
Path
(
"
fake_folder
"
)
fake_dagfile
=
pathlib
.
Path
(
"
fake.dag
"
)
with
patch
(
"
workspaces.workflow.services.workflow_service.subprocess.run
"
)
as
mock_sp_run
:
log_path
=
mock_workflow_service
.
_submit_dag
(
fake_folder
,
fake_dagfile
)
log_path
=
mock_workflow_service
.
_submit_dag
(
fake_folder
,
fake_dagfile
,
False
)
mock_sp_run
.
assert_called_with
(
[
"
condor_submit_dag
"
,
"
-f
"
,
fake_dagfile
.
name
],
cwd
=
str
(
fake_folder
.
absolute
()),
preexec_fn
=
mock_workflow_service
.
_switch_to_submituser
,
preexec_fn
=
mock_workflow_service
.
_switch_to_submituser
(
False
)
,
)
assert
log_path
.
name
==
"
fake.dag.dagman.log
"
...
...
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