Skip to content

Commit ea56f30

Browse files
authored
Merge pull request #13 from mlcommons/dev
Update debug mode exit code & tests to reflect successful debug mode exit
2 parents 0a8222e + 40666f2 commit ea56f30

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/test-downloader.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ jobs:
5050
CF_ACCESS_CLIENT_ID: ${{ steps.op-load-secrets.outputs.CF_ACCESS_CLIENT_ID }}
5151
CF_ACCESS_CLIENT_SECRET: ${{ steps.op-load-secrets.outputs.CF_ACCESS_CLIENT_SECRET }}
5252
run: |
53-
# Test debug mode - expect exit code 100
53+
# Test debug mode - expect exit code 0
5454
set +e # Don't exit on error
5555
bash ./mlc-r2-downloader.sh -xs https://auth-test.mlcommons-storage.org/metadata/dataset.uri
5656
exit_code=$?
5757
58-
if [ $exit_code -eq 100 ]; then
59-
echo "[PASS] Debug mode test PASSED (expected exit code 100)"
58+
if [ $exit_code -eq 0 ]; then
59+
echo "[PASS] Debug mode test PASSED (expected exit code 0)"
6060
else
6161
echo "[FAIL] Debug mode test FAILED (unexpected exit code: $exit_code)"
6262
exit 1
@@ -153,8 +153,8 @@ jobs:
153153
$output | ForEach-Object { Write-Host $_ }
154154
Write-Host "Script exit code: $exitCode"
155155
156-
if ($exitCode -eq 100) {
157-
Write-Host "[PASS] WSL Debug mode test PASSED (expected exit code 100)"
156+
if ($exitCode -eq 0) {
157+
Write-Host "[PASS] WSL Debug mode test PASSED (expected exit code 0)"
158158
exit 0
159159
} else {
160160
Write-Host "[FAIL] WSL Debug mode test FAILED (unexpected exit code: $exitCode)"
@@ -269,7 +269,7 @@ jobs:
269269
270270
$repoPath = (Get-Location).Path -replace '\\', '/' -replace '^([A-Z]):', '/cygdrive/$1'
271271
$repoPath = $repoPath.ToLower()
272-
C:\cygwin64\bin\bash.exe --login -c "export CF_ACCESS_CLIENT_ID='$clientId'; export CF_ACCESS_CLIENT_SECRET='$clientSecret'; bash '$repoPath/mlc-r2-downloader.sh' -xs https://auth-test.mlcommons-storage.org/metadata/dataset.uri; exit_code=`$?; if [ `"`$exit_code`" -ne 100 ]; then echo '[FAIL] Wrong exit code: `$exit_code'; exit 1; else echo '[PASS] Correct exit code 100 received.'; fi"
272+
C:\cygwin64\bin\bash.exe --login -c "export CF_ACCESS_CLIENT_ID='$clientId'; export CF_ACCESS_CLIENT_SECRET='$clientSecret'; bash '$repoPath/mlc-r2-downloader.sh' -xs https://auth-test.mlcommons-storage.org/metadata/dataset.uri; exit_code=`$?; if [ `"`$exit_code`" -ne 0 ]; then echo '[FAIL] Wrong exit code: `$exit_code'; exit 1; else echo '[PASS] Correct exit code 0 received.'; fi"
273273
274274
- name: Test script in Cygwin with service account and testing mode
275275
env:

mlc-r2-downloader.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ if [[ $DEBUG_INFO_THEN_EXIT == 1 ]]; then
883883

884884
echo -e "\nDEBUG INFO END"
885885

886-
exit 100
886+
exit 0
887887
fi
888888

889889
# ========= ACTUAL START OF DOWNLOAD =========

0 commit comments

Comments
 (0)