Skip to content

Commit dd57c1c

Browse files
committed
Modify file path in setup integration test
Removed the user from the filepath when the test files are registered in the database because it is not the case anymore and the presence of the user in the path made the recursive download to fail.
1 parent de67326 commit dd57c1c

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/integration/setup/setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ file_ids=$(docker run --rm --name client --network testing_default \
109109
-t -q -c "INSERT INTO sda.files (stable_id, submission_user, \
110110
submission_file_path, submission_file_size, archive_file_path, \
111111
archive_file_size, decrypted_file_size, backup_path, header, \
112-
encryption_method) VALUES ('urn:neic:001-001', 'integration-test', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8_elixir-europe.org/main/subfolder/dummy_data.c4gh', \
112+
encryption_method) VALUES ('urn:neic:001-001', 'integration-test', 'main/subfolder/dummy_data.c4gh', \
113113
1048729, '4293c9a7-dc50-46db-b79a-27ddc0dad1c6', 1049081, 1048605, \
114114
'', '637279707434676801000000010000006c000000000000006af1407abc74656b8913a7d323c4bfd30bf7c8ca359f74ae35357acef29dc5073799e207ec5d022b2601340585ff082565e55fbff5b6cdbbbe6b12a0d0a19ef325a219f8b62344325e22c8d26a8e82e45f053f4dcee10c0ec4bb9e466d5253f139dcd4be', 'CRYPT4GH'),
115-
('urn:neic:001-002', 'integration-test', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8_elixir-europe.org/main/subfolder2/dummy_data2.c4gh', \
115+
('urn:neic:001-002', 'integration-test', 'main/subfolder2/dummy_data2.c4gh', \
116116
1048729, 'f2e8b1d3-7a5c-4e0d-9c9a-8b4e3d7a5c4e', 1049081, 1048605, \
117117
'', '637279707434676801000000010000006c000000000000006af1407abc74656b8913a7d323c4bfd30bf7c8ca359f74ae35357acef29dc5073799e207ec5d022b2601340585ff082565e55fbff5b6cdbbbe6b12a0d0a19ef325a219f8b62344325e22c8d26a8e82e45f053f4dcee10c0ec4bb9e466d5253f139dcd4be', 'CRYPT4GH'),
118-
('urn:neic:001-003', 'integration-test', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8_elixir-europe.org/main/subfolder2/random/dummy_data3.c4gh', \
118+
('urn:neic:001-003', 'integration-test', 'main/subfolder2/random/dummy_data3.c4gh', \
119119
1048729, 'd9ab71e9-3884-429a-a6b7-bd63eeafe4a9', 1049081, 1048605, \
120120
'', '637279707434676801000000010000006c000000000000006af1407abc74656b8913a7d323c4bfd30bf7c8ca359f74ae35357acef29dc5073799e207ec5d022b2601340585ff082565e55fbff5b6cdbbbe6b12a0d0a19ef325a219f8b62344325e22c8d26a8e82e45f053f4dcee10c0ec4bb9e466d5253f139dcd4be', 'CRYPT4GH') RETURNING id;" | xargs)
121121

.github/integration/tests/30_list.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212

1313
# Check listing files in a dataset
1414
output=$(./sda-cli --config testing/s3cmd-download.conf list --dataset https://doi.example/ty009.sfrrss/600.45asasga --url http://localhost:8080)
15-
expected="FileIDSizePathurn:neic:001-0011.0MB5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8_elixir-europe.org/main/subfolder/dummy_data.c4ghurn:neic:001-0021.0MB5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8_elixir-europe.org/main/subfolder2/dummy_data2.c4ghurn:neic:001-0031.0MB5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8_elixir-europe.org/main/subfolder2/random/dummy_data3.c4ghDatasetsize:3.1MB"
15+
expected="FileIDSizePathurn:neic:001-0011.0MBmain/subfolder/dummy_data.c4ghurn:neic:001-0021.0MBmain/subfolder2/dummy_data2.c4ghurn:neic:001-0031.0MBmain/subfolder2/random/dummy_data3.c4ghDatasetsize:3.1MB"
1616
if [[ "${output//[$' \t\n\r']/}" == *"${expected//[$' \t\n\r']/}"* ]]; then
1717
echo "Successfully listed files in dataset"
1818
else

0 commit comments

Comments
 (0)