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
a573b188
Commit
a573b188
authored
1 year ago
by
Daniel Nemergut
Committed by
Charlotte Hausman
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Removed rawdata from conveyor's tests
parent
06b023d4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1618
update vlass templates for pimscache python3.10 upgrade
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/cli/executables/pexable/conveyor/test/test_deliver.py
+1
-1
1 addition, 1 deletion
apps/cli/executables/pexable/conveyor/test/test_deliver.py
apps/cli/executables/pexable/conveyor/test/test_retrieve.py
+4
-5
4 additions, 5 deletions
apps/cli/executables/pexable/conveyor/test/test_retrieve.py
with
5 additions
and
6 deletions
apps/cli/executables/pexable/conveyor/test/test_deliver.py
+
1
−
1
View file @
a573b188
...
...
@@ -84,7 +84,7 @@ class TestDeliveryConveyor:
@patch
(
"
os.chown
"
)
@patch
(
"
os.makedirs
"
)
def
test_move_subdirectories_to_qa_area
(
self
,
mock_dirs
,
mock_chown
,
mock_chmod
,
mock_move
,
mock_system
,
mock_link
):
with
patch
(
"
glob.glob
"
,
MagicMock
(
return_value
=
[
"
rawdata/
"
,
"
working/
"
,
"
products/
"
]))
as
contents
:
with
patch
(
"
glob.glob
"
,
MagicMock
(
return_value
=
[
"
working/
"
,
"
products/
"
]))
as
contents
:
path
=
"
/lustre/aoc/cluster/pipeline/docker/workspaces/qa2/tmpabcd1234
"
conveyor
.
move_subdirectories_to_qa_area
(
path
)
assert
mock_dirs
.
call_count
==
1
...
...
This diff is collapsed.
Click to expand it.
apps/cli/executables/pexable/conveyor/test/test_retrieve.py
+
4
−
5
View file @
a573b188
...
...
@@ -36,7 +36,6 @@ settings = {
action
=
"
Calibration Retrieval
"
PRODUCTS
=
"
products/
"
RAWDATA
=
"
rawdata/
"
WORKING
=
"
working/
"
conveyor
=
RetrievalConveyor
(
settings
=
settings
,
action
=
action
)
...
...
@@ -71,7 +70,7 @@ class TestRetrievalConveyor:
@patch
(
"
pathlib.Path.unlink
"
)
def
test_break_symlinks
(
self
,
mock_unlink
,
mock_sym
):
path
=
fake_determine_spool
()
dir_list
=
[
WORKING
,
RAWDATA
,
PRODUCTS
]
dir_list
=
[
WORKING
,
PRODUCTS
]
conveyor
.
break_symlinks
(
path
,
dir_list
)
assert
mock_sym
.
call_count
==
3
assert
mock_unlink
.
call_count
==
3
...
...
@@ -80,7 +79,7 @@ class TestRetrievalConveyor:
def
test_move_subdirectories_to_spool
(
self
,
mock_move
):
qa_path
=
fake_determine_qa
()
spool_path
=
fake_determine_spool
()
dir_list
=
[
WORKING
,
RAWDATA
,
PRODUCTS
]
dir_list
=
[
WORKING
,
PRODUCTS
]
conveyor
.
move_subdirectories_to_spool
(
qa_path
,
spool_path
,
dir_list
)
assert
mock_move
.
call_count
==
3
...
...
@@ -92,11 +91,11 @@ class TestRetrievalConveyor:
path
=
conveyor
.
determine_spool_directory
()
assert
isinstance
(
path
,
Path
)
@patch
(
"
glob.glob
"
,
return_value
=
[
WORKING
,
RAWDATA
,
PRODUCTS
])
@patch
(
"
glob.glob
"
,
return_value
=
[
WORKING
,
PRODUCTS
])
@patch
(
"
os.chdir
"
)
def
test_check_spool_contents
(
self
,
mock_chdir
,
mock_glob
):
spool
=
fake_determine_spool
()
expected_list
=
[
WORKING
,
RAWDATA
,
PRODUCTS
]
expected_list
=
[
WORKING
,
PRODUCTS
]
check
=
conveyor
.
check_spool_contents
(
spool
,
expected_list
)
assert
check
is
True
...
...
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