Squash merge avah/rename_to_gameplay_tests into avah/combine_simulated_and_field_tests

Author: nycrat

.github/workflows/main.yml

@@ -78,9 +78,8 @@ jobs:
           cd src
           bazel build --show_timestamps --copt=-O3 --verbose_failures \
             -- //... -//software:unix_full_system   \
-            -//software/simulated_tests/...         \
+            -//software/gameplay_tests/...         \
             -//software/ai/hl/...                   \
-            -//software/field_tests/...             \
             -//software/embedded/...                \
             -//toolchains/cc/...                    \
             -//software:unix_full_system_tar_gen
@@ -121,9 +120,8 @@ jobs:
           cd src
           bazel test --copt=-O3 --show_timestamps --verbose_failures \
             -- //... -//software:unix_full_system \
-            -//software/simulated_tests/...  \
+            -//software/gameplay_tests/...  \
             -//software/ai/hl/...            \
-            -//software/field_tests/...      \
             -//software/ai/navigator/...     \
             -//toolchains/cc/...             \
             -//software:unix_full_system_tar_gen
@@ -153,14 +151,15 @@ jobs:
       - uses: ./.github/actions/environment-setup
 
       - name: Simulated Test Run
+          # TODO (#2908): reenable once field tests can be ran as simulated
+          # //software/gameplay_tests/...    \
         run: |
           cd src
-          bazel test //software/simulated_tests:requirements_test
+          bazel test //software/gameplay_tests:requirements_test
           bazel test --copt=-O3 --flaky_test_attempts=3 --show_timestamps \
             --test_arg="--ci_mode"            \
             -- //software:unix_full_system       \
-            //software/simulated_tests/...    \
-            -//software/simulated_tests:requirements_test \
+            -//software/gameplay_tests:requirements_test \
             //software/ai/hl/...              \
             //software/ai/navigator/...
             

scripts/compile_pip_requirements.sh

@@ -17,6 +17,6 @@ BAZEL_ROOT_DIR="$CURR_DIR/../src"
 cd $BAZEL_ROOT_DIR
 bazel run //software/thunderscope:requirements.update
 bazel run //software/embedded/ansible:requirements.update
-bazel run //software/simulated_tests:requirements.update
+bazel run //software/gameplay_tests:requirements.update
 bazel run //software/embedded/robot_diagnostics_cli:requirements.update
 bazel run //starlark/nanopb:requirements.update

src/MODULE.bazel

@@ -50,12 +50,12 @@ pip.parse(
 )
 use_repo(pip, "ansible_deps")
 pip.parse(
-    hub_name = "simulated_tests_deps",
+    hub_name = "gameplay_tests_deps",
     python_interpreter = "/opt/tbotspython/bin/python",
     python_version = "3.12",
-    requirements_lock = "//software/simulated_tests:requirements_lock.txt",
+    requirements_lock = "//software/gameplay_tests:requirements_lock.txt",
 )
-use_repo(pip, "simulated_tests_deps")
+use_repo(pip, "gameplay_tests_deps")
 pip.parse(
     hub_name = "robot_diagnostics_cli_deps",
     python_interpreter = "/opt/tbotspython/bin/python",

src/software/BUILD

@@ -125,7 +125,7 @@ py_library(
     name = "conftest",
     srcs = ["conftest.py"],
     deps = [
-        "//software/field_tests:field_test_fixture",
-        "//software/simulated_tests:simulated_test_fixture",
+        "//software/gameplay_tests:field_test_fixture",
+        "//software/gameplay_tests:simulated_test_fixture",
     ],
 )

src/software/ai/hl/stp/play/BUILD

@@ -1,4 +1,4 @@
-load("@simulated_tests_deps//:requirements.bzl", "requirement")
+load("@gameplay_tests_deps//:requirements.bzl", "requirement")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -78,7 +78,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests/validation:validations",
+        "//software/gameplay_tests/validation:validations",
         requirement("pytest"),
     ],
 )
@@ -92,7 +92,7 @@ py_test(
     main = "stop_play_test.py",
     deps = [
         "//software:conftest",
-        "//software/simulated_tests/validation:validations",
+        "//software/gameplay_tests/validation:validations",
         requirement("pytest"),
     ],
 )
@@ -147,7 +147,7 @@ py_test(
         "//proto:software_py_proto",
         "//proto:tbots_py_proto",
         "//software:conftest",
-        "//software/simulated_tests/validation:validations",
+        "//software/gameplay_tests/validation:validations",
         requirement("pytest"),
     ],
 )

src/software/ai/hl/stp/play/ball_placement/BUILD

@@ -1,4 +1,4 @@
-load("@simulated_tests_deps//:requirements.bzl", "requirement")
+load("@gameplay_tests_deps//:requirements.bzl", "requirement")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -39,7 +39,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests/validation:validations",
+        "//software/gameplay_tests/validation:validations",
         requirement("pytest"),
     ],
 )

src/software/ai/hl/stp/play/ball_placement/ball_placement_play_test.py

@@ -5,14 +5,14 @@
 from proto.import_all_protos import *
 from proto.ssl_gc_common_pb2 import Team
 from proto.message_translation.tbots_protobuf import create_world_state
-from software.simulated_tests.validation.ball_enters_region import (
+from software.gameplay_tests.validation.ball_enters_region import (
     BallAlwaysStaysInRegion,
     BallEventuallyEntersRegion,
 )
-from software.simulated_tests.validation.robot_enters_region import (
+from software.gameplay_tests.validation.robot_enters_region import (
     RobotEventuallyExitsRegion,
 )
-from software.simulated_tests.simulated_test_fixture import (
+from software.gameplay_tests.simulated_test_fixture import (
     pytest_main,
 )
 

src/software/ai/hl/stp/play/crease_defense/BUILD

@@ -1,4 +1,4 @@
-load("@simulated_tests_deps//:requirements.bzl", "requirement")
+load("@gameplay_tests_deps//:requirements.bzl", "requirement")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -35,7 +35,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests/validation:validations",
+        "//software/gameplay_tests/validation:validations",
         requirement("pytest"),
     ],
 )

src/software/ai/hl/stp/play/crease_defense/crease_defense_play_test.py

@@ -3,16 +3,16 @@
 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.simulated_tests.simulated_test_fixture import (
+from software.gameplay_tests.simulated_test_fixture import (
     pytest_main,
 )
-from software.simulated_tests.validation.robot_speed_threshold import (
+from software.gameplay_tests.validation.robot_speed_threshold import (
     RobotSpeedEventuallyBelowThreshold,
 )
-from software.simulated_tests.validation.robot_enters_region import (
+from software.gameplay_tests.validation.robot_enters_region import (
     NumberOfRobotsEventuallyEntersRegion,
 )
-from software.simulated_tests.validation.delay_validation import DelayValidation
+from software.gameplay_tests.validation.delay_validation import DelayValidation
 
 
 def test_crease_defense_play(simulated_test_runner):

src/software/ai/hl/stp/play/defense/BUILD

@@ -1,4 +1,4 @@
-load("@simulated_tests_deps//:requirements.bzl", "requirement")
+load("@gameplay_tests_deps//:requirements.bzl", "requirement")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -38,7 +38,7 @@ py_test(
     ],
     deps = [
         "//software:conftest",
-        "//software/simulated_tests/validation:validations",
+        "//software/gameplay_tests/validation:validations",
         requirement("pytest"),
     ],
 )