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

fixes issues #2955 and #2959 #3010

Merged
merged 9 commits into from
Oct 29, 2022
Merged

fixes issues #2955 and #2959 #3010

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fab25d2
Update test_pecanapi.sh
hangyakuzero Aug 7, 2022
46ac14b
Update test.status.R
hangyakuzero Aug 7, 2022
e272b9d
Update test.status.R
hangyakuzero Aug 7, 2022
df9dd05
fixes issue #2959
hangyakuzero Aug 7, 2022
0f7a63a
changed regex to accept blank spaces
hangyakuzero Aug 12, 2022
c7e4d85
Merge branch 'develop' into develop
Aariq Sep 28, 2022
61d4bbe
Merge branch 'develop' into develop
Aariq Oct 28, 2022
b58d9eb
make regex for qsub.jobid as general as possible
Aariq Oct 28, 2022
16a7f2f
Merge branch 'develop' into develop
Aariq Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/api/test_pecanapi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
cd R; ./entrypoint.R 2>/dev/null &
PID=$!

while ! curl --output /dev/null --silent http://localhost:8000
while ! curl --output /dev/null --silent http://pecan.localhost/
do
sleep 1 && echo -n .
done

cd ../tests; ./alltests.R
kill $PID
kill $PID
4 changes: 2 additions & 2 deletions apps/api/tests/test.status.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
context("Testing the /api/status endpoint")

test_that("Calling /api/status returns Status 200", {
res <- httr::GET("http://localhost:8000/api/status")
res <- httr::GET(" http://pecan.localhost/api/status")
expect_equal(res$status, 200)
})
})
2 changes: 1 addition & 1 deletion base/settings/R/check.all.settings.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ check.settings <- function(settings, force = FALSE) {
"qsub not specified using default value :", settings$host$qsub)
}
if (is.null(settings$host$qsub.jobid)) {
settings$host$qsub.jobid <- "Your job ([0-9]+) .*"
settings$host$qsub.jobid <- "Your job ^[A-Za-z0-9_ -]*$"
Aariq marked this conversation as resolved.
Show resolved Hide resolved
PEcAn.logger::logger.info(
"qsub.jobid not specified using default value :",
settings$host$qsub.jobid)
Expand Down