From 662b79d75ea54e8062d1fb7b621419c4b9d82c23 Mon Sep 17 00:00:00 2001
From: Brian Kroth <bpkroth@users.noreply.github.com>
Date: Fri, 17 Jan 2025 14:08:03 -0600
Subject: [PATCH] Fixups for running pytest via VSCode (#933)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Pull Request

## Title

Fixups for running pytest via VSCode

______________________________________________________________________

## Description

@motus noticed that running all tests in VSCode was hanging inside a
DevContainer on MacOS.

After some debugging I determined that there was some mismatch between
discovering tests and running them, specifically for the
GridSearchOptimizer. This was true on the CLI as well.

Adding it to the `__init__.py` for that submodule seems to fix the
issue.

______________________________________________________________________

## Type of Change

- 🛠️ Bug fix

______________________________________________________________________

## Testing

- Local VSCode in both DevContainer and MacOS native mode.

______________________________________________________________________

## Additional Notes (optional)

Don't know of others like this but I wonder if that's an issue now ...

______________________________________________________________________
---
 mlos_bench/mlos_bench/optimizers/__init__.py                | 6 ++++--
 .../test-cases/good/partial/grid_search_opt_minimal.jsonc   | 2 +-
 .../config/schemas/optimizers/test_optimizer_schemas.py     | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mlos_bench/mlos_bench/optimizers/__init__.py b/mlos_bench/mlos_bench/optimizers/__init__.py
index 7f2d6310c9a..faf186447f5 100644
--- a/mlos_bench/mlos_bench/optimizers/__init__.py
+++ b/mlos_bench/mlos_bench/optimizers/__init__.py
@@ -10,15 +10,17 @@
 """
 
 from mlos_bench.optimizers.base_optimizer import Optimizer
+from mlos_bench.optimizers.grid_search_optimizer import GridSearchOptimizer
 from mlos_bench.optimizers.manual_optimizer import ManualOptimizer
 from mlos_bench.optimizers.mlos_core_optimizer import MlosCoreOptimizer
 from mlos_bench.optimizers.mock_optimizer import MockOptimizer
 from mlos_bench.optimizers.one_shot_optimizer import OneShotOptimizer
 
 __all__ = [
-    "Optimizer",
+    "GridSearchOptimizer",
     "ManualOptimizer",
+    "MlosCoreOptimizer",
     "MockOptimizer",
     "OneShotOptimizer",
-    "MlosCoreOptimizer",
+    "Optimizer",
 ]
diff --git a/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test-cases/good/partial/grid_search_opt_minimal.jsonc b/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test-cases/good/partial/grid_search_opt_minimal.jsonc
index 297e3a62c8e..0311708350f 100644
--- a/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test-cases/good/partial/grid_search_opt_minimal.jsonc
+++ b/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test-cases/good/partial/grid_search_opt_minimal.jsonc
@@ -1,4 +1,4 @@
 {
-    "class": "mlos_bench.optimizers.grid_search_optimizer.GridSearchOptimizer"
+    "class": "mlos_bench.optimizers.GridSearchOptimizer"
     // no config required
 }
diff --git a/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test_optimizer_schemas.py b/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test_optimizer_schemas.py
index 9cbad7b2732..487a269e25b 100644
--- a/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test_optimizer_schemas.py
+++ b/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test_optimizer_schemas.py
@@ -151,3 +151,7 @@ def test_optimizer_configs_with_extra_param(test_case_name: str) -> None:
         TEST_CASES.by_type["good"][test_case_name],
         ConfigSchema.UNIFIED,
     )
+
+
+if __name__ == "__main__":
+    pytest.main(args=["-n0", "-k", "grid_search_optimizer"])