Move pytest_main definition to util.py file

nycrat · nycrat · commit fd08dcda79cf · 2026-06-13T20:02:23.000-07:00
diff --git a/src/software/BUILD b/src/software/BUILD
@@ -126,6 +126,7 @@ py_library(
     srcs = ["conftest.py"],
     deps = [
         "//software/gameplay_tests:field_test_fixture",
+        "//software/gameplay_tests:util",
         "//software/gameplay_tests:simulated_test_fixture",
     ],
 )
diff --git a/src/software/ai/hl/stp/play/ball_placement/ball_placement_play_test.py b/src/software/ai/hl/stp/play/ball_placement/ball_placement_play_test.py
@@ -12,9 +12,7 @@
 from software.gameplay_tests.validation.robot_enters_region import (
     RobotEventuallyExitsRegion,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/play/crease_defense/crease_defense_play_test.py b/src/software/ai/hl/stp/play/crease_defense/crease_defense_play_test.py
@@ -3,9 +3,7 @@
 from proto.import_all_protos import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from software.gameplay_tests.validation.robot_speed_threshold import (
     RobotSpeedEventuallyBelowThreshold,
 )
diff --git a/src/software/ai/hl/stp/play/defense/defense_play_test.py b/src/software/ai/hl/stp/play/defense/defense_play_test.py
@@ -8,9 +8,7 @@
 )
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/play/enemy_ball_placement/enemy_ball_placement_play_test.py b/src/software/ai/hl/stp/play/enemy_ball_placement/enemy_ball_placement_play_test.py
@@ -3,9 +3,7 @@
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import PlayName
 from software.gameplay_tests.validation.robot_enters_placement_region import *
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
 
diff --git a/src/software/ai/hl/stp/play/enemy_free_kick/enemy_free_kick_play_test.py b/src/software/ai/hl/stp/play/enemy_free_kick/enemy_free_kick_play_test.py
@@ -13,9 +13,7 @@
 )
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/play/example/example_play_test.py b/src/software/ai/hl/stp/play/example/example_play_test.py
@@ -7,9 +7,7 @@
 from proto.ssl_gc_common_pb2 import Team
 from proto.play_pb2 import PlayName
 from proto.import_all_protos import Command
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 def test_example_play(simulated_test_runner):
diff --git a/src/software/ai/hl/stp/play/free_kick/free_kick_play_test.py b/src/software/ai/hl/stp/play/free_kick/free_kick_play_test.py
@@ -16,9 +16,7 @@
 from software.gameplay_tests.validation.ball_kicked_in_direction import (
     BallEventuallyKickedInDirection,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/play/halt_play/halt_play_test.py b/src/software/ai/hl/stp/play/halt_play/halt_play_test.py
@@ -2,9 +2,7 @@
 from software.gameplay_tests.validation.robot_speed_threshold import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 # TODO issue  #2599 - Remove Duration parameter from test
diff --git a/src/software/ai/hl/stp/play/kickoff_enemy/kickoff_enemy_play_test.py b/src/software/ai/hl/stp/play/kickoff_enemy/kickoff_enemy_play_test.py
@@ -13,9 +13,7 @@
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.import_all_protos import Command
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 def test_kickoff_enemy_play(simulated_test_runner):
diff --git a/src/software/ai/hl/stp/play/kickoff_friendly/kickoff_friendly_play_test.py b/src/software/ai/hl/stp/play/kickoff_friendly/kickoff_friendly_play_test.py
@@ -17,9 +17,7 @@
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
 from proto.import_all_protos import Command
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 def test_kickoff_friendly_play(simulated_test_runner):
diff --git a/src/software/ai/hl/stp/play/kickoff_play_test.py b/src/software/ai/hl/stp/play/kickoff_play_test.py
@@ -7,9 +7,7 @@
 from proto.import_all_protos import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from software.gameplay_tests.validation.or_validation import OrValidation
 
 
diff --git a/src/software/ai/hl/stp/play/offense/offense_play_test.py b/src/software/ai/hl/stp/play/offense/offense_play_test.py
@@ -6,9 +6,7 @@
 from software.gameplay_tests.validation.excessive_dribbling import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 def test_offense_play(simulated_test_runner):
diff --git a/src/software/ai/hl/stp/play/passing_sim_test.py b/src/software/ai/hl/stp/play/passing_sim_test.py
@@ -1,9 +1,7 @@
 import pytest
 import software.python_bindings as tbots_cpp
 from proto.import_all_protos import *
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from proto.message_translation.tbots_protobuf import create_world_state
 from software.gameplay_tests.validation.friendly_receives_ball_slow import (
     FriendlyAlwaysReceivesBallSlow,
diff --git a/src/software/ai/hl/stp/play/penalty_kick_enemy/penalty_kick_enemy_play_test.py b/src/software/ai/hl/stp/play/penalty_kick_enemy/penalty_kick_enemy_play_test.py
@@ -16,9 +16,7 @@
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.import_all_protos import Command
 from proto.ssl_gc_common_pb2 import Team
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/play/shoot_or_chip/shoot_or_chip_play_test.py b/src/software/ai/hl/stp/play/shoot_or_chip/shoot_or_chip_play_test.py
@@ -3,9 +3,7 @@
 
 import software.python_bindings as tbots_cpp
 from proto.play_pb2 import PlayName
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from proto.import_all_protos import *
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.ssl_gc_common_pb2 import Team
diff --git a/src/software/ai/hl/stp/play/shoot_or_pass/shoot_or_pass_play_test.py b/src/software/ai/hl/stp/play/shoot_or_pass/shoot_or_pass_play_test.py
@@ -8,7 +8,7 @@
 from software.gameplay_tests.validation.friendly_team_scored import (
     FriendlyTeamEventuallyScored,
 )
-from software.gameplay_tests.simulated_test_fixture import pytest_main
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.skip(
diff --git a/src/software/ai/hl/stp/play/stop_play_test.py b/src/software/ai/hl/stp/play/stop_play_test.py
@@ -12,7 +12,7 @@
     RobotNeverEntersRegion,
 )
 from software.gameplay_tests.validation.delay_validation import DelayValidation
-from software.gameplay_tests.simulated_test_fixture import pytest_main
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/tactic/attacker/attacker_tactic_test.py b/src/software/ai/hl/stp/tactic/attacker/attacker_tactic_test.py
@@ -19,7 +19,7 @@
 from software.gameplay_tests.validation.robot_at_position import (
     RobotEventuallyAtPosition,
 )
-from software.gameplay_tests.simulated_test_fixture import pytest_main
+from software.gameplay_tests.util import pytest_main
 
 
 def calculate_ball_velocity(passer_point, receiver_point, speed):
diff --git a/src/software/ai/hl/stp/tactic/chip/chip_tactic_test.py b/src/software/ai/hl/stp/tactic/chip/chip_tactic_test.py
@@ -9,9 +9,7 @@
 from software.gameplay_tests.validation.ball_kicked_in_direction import (
     BallEventuallyKickedInDirection,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.import_all_protos import ChipTactic
 
diff --git a/src/software/ai/hl/stp/tactic/crease_defender/crease_defender_tactic_test.py b/src/software/ai/hl/stp/tactic/crease_defender/crease_defender_tactic_test.py
@@ -23,9 +23,7 @@
     RobotEventuallyEntersRegion,
     RobotNeverEntersRegion,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 def test_not_bumping_ball_towards_net(simulated_test_runner):
diff --git a/src/software/ai/hl/stp/tactic/dribble/dribble_tactic_test.py b/src/software/ai/hl/stp/tactic/dribble/dribble_tactic_test.py
@@ -21,9 +21,7 @@
 from software.gameplay_tests.validation.delay_validation import (
     DelayValidation,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 def get_enemy_robot_positions():
diff --git a/src/software/ai/hl/stp/tactic/goalie/goalie_tactic_test.py b/src/software/ai/hl/stp/tactic/goalie/goalie_tactic_test.py
@@ -9,9 +9,7 @@
 from software.gameplay_tests.validation.ball_speed_threshold import *
 from software.gameplay_tests.validation.robot_speed_threshold import *
 from software.gameplay_tests.validation.excessive_dribbling import *
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from proto.message_translation.tbots_protobuf import create_world_state
 
 
diff --git a/src/software/ai/hl/stp/tactic/halt/halt_tactic_test.py b/src/software/ai/hl/stp/tactic/halt/halt_tactic_test.py
@@ -9,9 +9,7 @@
     RobotSpeedEventuallyBelowThreshold,
 )
 from software.gameplay_tests.validation.delay_validation import DelayValidation
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/tactic/kick/kick_tactic_test.py b/src/software/ai/hl/stp/tactic/kick/kick_tactic_test.py
@@ -7,9 +7,7 @@
 from software.gameplay_tests.validation.ball_kicked_in_direction import (
     BallEventuallyKickedInDirection,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/tactic/move/move_tactic_test.py b/src/software/ai/hl/stp/tactic/move/move_tactic_test.py
@@ -17,9 +17,7 @@
     RobotEventuallyAtAngularVelocity,
 )
 from software.gameplay_tests.validation.duration_validation import DurationValidation
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from proto.message_translation.tbots_protobuf import create_world_state
 from proto.import_all_protos import *
 
diff --git a/src/software/ai/hl/stp/tactic/pass_defender/pass_defender_tactic_test.py b/src/software/ai/hl/stp/tactic/pass_defender/pass_defender_tactic_test.py
@@ -9,9 +9,7 @@
 from software.gameplay_tests.validation.ball_speed_threshold import *
 from software.gameplay_tests.validation.robot_speed_threshold import *
 from software.gameplay_tests.validation.excessive_dribbling import *
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from proto.message_translation.tbots_protobuf import create_world_state
 
 
diff --git a/src/software/ai/hl/stp/tactic/penalty_kick/penalty_kick_tactic_test.py b/src/software/ai/hl/stp/tactic/penalty_kick/penalty_kick_tactic_test.py
@@ -13,9 +13,7 @@
     BallAlwaysMovesForward,
 )
 from proto.message_translation.tbots_protobuf import create_world_state
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/tactic/pivot_kick/pivot_kick_tactic_test.py b/src/software/ai/hl/stp/tactic/pivot_kick/pivot_kick_tactic_test.py
@@ -7,9 +7,7 @@
 from software.gameplay_tests.validation.ball_kicked_in_direction import (
     BallEventuallyKickedInDirection,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 @pytest.mark.parametrize(
diff --git a/src/software/ai/hl/stp/tactic/receiver/receiver_tactic_test.py b/src/software/ai/hl/stp/tactic/receiver/receiver_tactic_test.py
@@ -12,7 +12,7 @@
 from software.gameplay_tests.validation.robot_received_ball import (
     RobotEventuallyReceivedBall,
 )
-from software.gameplay_tests.simulated_test_fixture import pytest_main
+from software.gameplay_tests.util import pytest_main
 
 
 def calculate_ball_velocity(passer_point, receiver_point, speed):
diff --git a/src/software/ai/navigator/trajectory/simulated_hrvo_test.py b/src/software/ai/navigator/trajectory/simulated_hrvo_test.py
@@ -1,7 +1,5 @@
 import pytest
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 from software.gameplay_tests.validation.avoid_collisions import *
 import software.python_bindings as tbots
 from software.py_constants import *
diff --git a/src/software/gameplay_tests/BUILD b/src/software/gameplay_tests/BUILD
@@ -80,6 +80,16 @@ py_library(
     ],
 )
 
+py_library(
+    name = "util",
+    srcs = [
+        "util.py",
+    ],
+    deps = [
+        requirement("pytest"),
+    ],
+)
+
 py_test(
     name = "simulated_test_ball_model",
     srcs = [
diff --git a/src/software/gameplay_tests/passing_field_test.py b/src/software/gameplay_tests/passing_field_test.py
@@ -4,9 +4,7 @@
 from software.gameplay_tests.validation.friendly_receives_ball_slow import (
     FriendlyAlwaysReceivesBallSlow,
 )
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 
 def test_passing(field_test_runner):
diff --git a/src/software/gameplay_tests/pivot_kick_field_test.py b/src/software/gameplay_tests/pivot_kick_field_test.py
@@ -4,9 +4,7 @@
 
 from software.gameplay_tests.simulated_test_fixture import *
 from software.logger.logger import create_logger
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 logger = create_logger(__name__)
 
diff --git a/src/software/gameplay_tests/simulated_test_ball_model.py b/src/software/gameplay_tests/simulated_test_ball_model.py
@@ -10,9 +10,7 @@
 from software.gameplay_tests.validation.ball_stops_in_region import *
 from software.gameplay_tests.validation.excessive_dribbling import *
 from proto.message_translation.tbots_protobuf import create_world_state
-from software.gameplay_tests.simulated_test_fixture import (
-    pytest_main,
-)
+from software.gameplay_tests.util import pytest_main
 
 # the friction model currently used in the er-force simulator
 
diff --git a/src/software/gameplay_tests/simulated_test_fixture.py b/src/software/gameplay_tests/simulated_test_fixture.py
diff --git a/src/software/gameplay_tests/util.py b/src/software/gameplay_tests/util.py
diff --git a/src/software/sensor_fusion/filter/ball_occlusion_test.py b/src/software/sensor_fusion/filter/ball_occlusion_test.py
diff --git a/src/software/thunderscope/replay/test/replay_corruption_test.py b/src/software/thunderscope/replay/test/replay_corruption_test.py
diff --git a/src/software/thunderscope/replay/test/replay_indexing_test.py b/src/software/thunderscope/replay/test/replay_indexing_test.py

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ py_library(`
`126`	`126`	`srcs = ["conftest.py"],`
`127`	`127`	`deps = [`
`128`	`128`	`"//software/gameplay_tests:field_test_fixture",`
	`129`	`+ "//software/gameplay_tests:util",`
`129`	`130`	`"//software/gameplay_tests:simulated_test_fixture",`
`130`	`131`	`],`
`131`	`132`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@`
`12`	`12`	`from software.gameplay_tests.validation.robot_enters_region import (`
`13`	`13`	`RobotEventuallyExitsRegion,`
`14`	`14`	`)`
`15`		`-from software.gameplay_tests.simulated_test_fixture import (`
`16`		`- pytest_main,`
`17`		`-)`
	`15`	`+from software.gameplay_tests.util import pytest_main`
`18`	`16`
`19`	`17`
`20`	`18`	`@pytest.mark.parametrize(`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,7 @@`
`8`	`8`	`)`
`9`	`9`	`from proto.message_translation.tbots_protobuf import create_world_state`
`10`	`10`	`from proto.ssl_gc_common_pb2 import Team`
`11`		`-from software.gameplay_tests.simulated_test_fixture import (`
`12`		`- pytest_main,`
`13`		`-)`
	`11`	`+from software.gameplay_tests.util import pytest_main`
`14`	`12`
`15`	`13`
`16`	`14`	`@pytest.mark.parametrize(`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@`
`13`	`13`	`)`
`14`	`14`	`from proto.message_translation.tbots_protobuf import create_world_state`
`15`	`15`	`from proto.ssl_gc_common_pb2 import Team`
`16`		`-from software.gameplay_tests.simulated_test_fixture import (`
`17`		`- pytest_main,`
`18`		`-)`
	`16`	`+from software.gameplay_tests.util import pytest_main`
`19`	`17`
`20`	`18`
`21`	`19`	`@pytest.mark.parametrize(`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,7 @@`
`16`	`16`	`from software.gameplay_tests.validation.ball_kicked_in_direction import (`
`17`	`17`	`BallEventuallyKickedInDirection,`
`18`	`18`	`)`
`19`		`-from software.gameplay_tests.simulated_test_fixture import (`
`20`		`- pytest_main,`
`21`		`-)`
	`19`	`+from software.gameplay_tests.util import pytest_main`
`22`	`20`
`23`	`21`
`24`	`22`	`@pytest.mark.parametrize(`