Skip to content

Commit

Permalink
test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bisgaard-itis committed Nov 3, 2023
1 parent 7a29a7b commit 0b02aed
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/osparc/osparc.py
Expand Up @@ -114,7 +114,7 @@ def start_simulation(data):

status = solvers_api.start_job(solver.id, solver.version, job.id)

if status.state != "PUBLISHED":
if status.state not in {"PUBLISHED", "PENDING"}:
raise SimulationException(
"the simulation job could not be submitted")

Expand Down
18 changes: 13 additions & 5 deletions tests/test_osparc.py
Expand Up @@ -132,13 +132,17 @@ def test_osparc_successful_simulation(client):
}
r = client.post("/start_simulation", json=data)
assert r.status_code == 200
check_simulation_data = json.loads(r.data)["data"]
json_data: dict = json.loads(r.data)
assert (status := json_data.get("status")) is not None
assert status == "ok"
assert (check_simulation_data := json_data.get("data")) is not None
while True:
r = client.post("/check_simulation", json=check_simulation_data)
assert r.status_code == 200
json_data = json.loads(r.data)
assert json_data["status"] == "ok"
if "results" in json_data:
assert (status := json_data.get("status")) is not None
assert status == "ok"
if json_data.get("results"):
assert json.dumps(json_data, sort_keys=True) == json.dumps(res, sort_keys=True)
break

Expand Down Expand Up @@ -166,11 +170,15 @@ def test_osparc_failing_simulation(client):
}
r = client.post("/start_simulation", json=data)
assert r.status_code == 200
check_simulation_data = json.loads(r.data)["data"]
json_data: dict = json.loads(r.data)
assert (status := json_data.get("status")) is not None
assert status == "ok"
assert (check_simulation_data := json_data.get("data")) is not None
while True:
r = client.post("/check_simulation", json=check_simulation_data)
assert r.status_code == 200
json_data = json.loads(r.data)
if json_data["status"] == "nok":
assert (status := json_data.get("status")) is not None
if status == "nok":
assert json.dumps(json_data, sort_keys=True) == json.dumps(res, sort_keys=True)
break

0 comments on commit 0b02aed

Please sign in to comment.