Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add FTPS server to system test and test successful upload #268

Merged
merged 66 commits into from
Feb 2, 2024
Merged

Add FTPS server to system test and test successful upload #268

merged 66 commits into from
Feb 2, 2024

Conversation

milanmlft
Copy link
Member

@milanmlft milanmlft commented Jan 30, 2024 •
edited
Loading

  • Some file reorganisation: move cogstack dummy service to test/dummy-services/cogstack
  • Move the test ftp-server from pixl_core to test/dummy-services/ftp-server
  • Make sure orthanc-anon uploads images over FTPS after anonymisation
  • Add check to system test to verify a zip file has been uploaded to FTPS server
  • Cleanup ftp server files after tests

Fixes #240

@milanmlft milanmlft requested a review from a team January 30, 2024 12:57
@milanmlft milanmlft marked this pull request as ready for review January 30, 2024 12:57
This was referenced Jan 30, 2024
Closed
Merged
stefpiatek
stefpiatek approved these changes Jan 30, 2024
View reviewed changes
Copy link
Contributor

@stefpiatek stefpiatek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, suggestion and a question

.env.sample Outdated Show resolved Hide resolved
orthanc/orthanc-anon/plugin/pixl.py Outdated Show resolved Hide resolved
jeremyestein
jeremyestein previously requested changes Jan 30, 2024
View reviewed changes
test/docker-compose.yml Outdated Show resolved Hide resolved
test/scripts/check_ftps_upload.py Outdated Show resolved Hide resolved
test/scripts/check_ftps_upload.py Outdated Show resolved Hide resolved
pixl_core/tests/conftest.py Outdated Show resolved Hide resolved
pixl_core/tests/conftest.py Outdated Show resolved Hide resolved
pixl_core/tests/conftest.py Outdated Show resolved Hide resolved
@jstutters
Copy link
Contributor

#272 may help with this by fixing a problem in pixl_dcmd that was preventing DICOMs received by orthanc-anon from being stored.

@stefpiatek stefpiatek dismissed jeremyestein’s stale review February 2, 2024 14:28

As far as I can see, the changes request have been resolved

@milanmlft milanmlft merged commit 428c3a5 into main Feb 2, 2024
8 checks passed
@milanmlft milanmlft deleted the milanmlft/system-test-ftps branch February 2, 2024 16:26
@milanmlft milanmlft mentioned this pull request Feb 13, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruaridhg ruaridhg ruaridhg left review comments

@stefpiatek stefpiatek stefpiatek approved these changes

@peshence peshence peshence left review comments

@jeremyestein jeremyestein Awaiting requested review from jeremyestein

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use FTPS server in system tests
6 participants
@milanmlft @jstutters @peshence @jeremyestein @stefpiatek @ruaridhg