Skip to content

test: use paseos_instance.wait_for_activity() method in tests #213

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

Open
rubenperezm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test: use paseos_instance.wait_for_activity() method in tests #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions paseos/tests/activity_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Simple test of starting an activity"""
from test_utils import get_default_instance, wait_for_activity
from test_utils import get_default_instance

from paseos import SpacecraftActor
import asyncio
Expand Down Expand Up @@ -58,7 +58,7 @@ async def func(args):

# Run the activity
sim.perform_activity("Testing", activity_func_args=[test_val])
await wait_for_activity(sim)
await sim.wait_for_activity()

# Check activity result
assert test_val[0] == 10
Expand Down Expand Up @@ -99,7 +99,7 @@ async def act2(args):

# try running it
sim.perform_activity("act1", activity_func_args=[test_value])
await wait_for_activity(sim)
await sim.wait_for_activity()

# Value should be 42 as first activity is started but then an error occurs trying the second
assert test_value[0] == 42
Expand Down Expand Up @@ -150,7 +150,7 @@ async def on_termination(args):
constraint_func_args=[sat1],
termination_func_args=[test_value, test_value2],
)
await wait_for_activity(sim)
await sim.wait_for_activity()

assert test_value == test_value2
assert sat1.battery_level_in_Ws >= 505
5 changes: 2 additions & 3 deletions paseos/tests/operations_monitor_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import pytest
import pykep as pk

from test_utils import wait_for_activity
import paseos
from paseos import ActorBuilder, SpacecraftActor, load_default_cfg

Expand Down Expand Up @@ -43,10 +42,10 @@ async def func2(args):

# Run the activity
sim.perform_activity("Activity_1")
await wait_for_activity(sim)
await sim.wait_for_activity()

sim.perform_activity("Activity_2")
await wait_for_activity(sim)
await sim.wait_for_activity()

# Try out item function
sim.monitor["state_of_charge"]
Expand Down
6 changes: 3 additions & 3 deletions paseos/tests/radiation_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np
import pytest

from test_utils import get_default_instance, wait_for_activity
from test_utils import get_default_instance
from paseos.radiation.radiation_model import RadiationModel
from paseos import ActorBuilder
import paseos
Expand Down Expand Up @@ -83,7 +83,7 @@ async def func(args):

# Run the activity
sim.perform_activity("Testing")
await wait_for_activity(sim)
await sim.wait_for_activity()

# Check sat1 died.
assert sat1.is_dead
Expand Down Expand Up @@ -120,7 +120,7 @@ async def func(args):

# Run the activity
sim.perform_activity("Testing", activity_func_args=[test_val])
await wait_for_activity(sim)
await sim.wait_for_activity()

# Check activity result, exact result is runtime dependent.
assert test_val[0] > 4 and test_val[0] < 8
Expand Down
3 changes: 1 addition & 2 deletions paseos/tests/thermal_model_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""Simple test of the thermal model to see if temperatures evolve as expected"""
import pykep as pk

from test_utils import wait_for_activity
import paseos
from paseos import SpacecraftActor, ActorBuilder, load_default_cfg
import asyncio
Expand Down Expand Up @@ -51,7 +50,7 @@ async def func(args):

# Run the activity
sim.perform_activity("Activity_1")
await wait_for_activity(sim)
await sim.wait_for_activity()
assert sat1.temperature_in_K > 285
assert sat1.temperature_in_K < 300
sim.save_status_log_csv("thermal_test.csv")
Expand Down
3 changes: 1 addition & 2 deletions paseos/tests/time_multiplier_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import pytest
import pykep as pk

from test_utils import wait_for_activity
import paseos
from paseos import ActorBuilder, SpacecraftActor, load_default_cfg

Expand Down Expand Up @@ -43,7 +42,7 @@ async def func(args):

# Run the activity
sim.perform_activity("Testing", activity_func_args=[test_val])
await wait_for_activity(sim)
await sim.wait_for_activity()

# Check activity result
assert test_val[0] == 5
Expand Down