moved default metadata fn to IntegtestWorkspace

Author: wangpatrick57

env/integtest_pg_conn.py

@@ -23,7 +23,7 @@ def setUp(self) -> None:
             "Make sure Postgres isn't running before starting the integration test. `pkill postgres` is one way "
             + "to ensure this. Be careful about accidentally taking down other people's Postgres instances though.",
         )
-        self.metadata = MockTuningAgent.get_default_metadata()
+        self.metadata = IntegtestWorkspace.get_default_metadata()
 
         # The reason we restart Postgres every time is to ensure a "clean" starting point
         # so that all tests are independent of each other.

env/integtest_tuning_agent.py

@@ -65,7 +65,7 @@ def test_get_metadata(self) -> None:
         agent = MockTuningAgent(IntegtestWorkspace.get_dbgym_cfg())
         reader = TuningAgentArtifactsReader(agent.tuning_agent_artifacts_dpath)
         metadata = reader.get_metadata()
-        expected_metadata = MockTuningAgent.get_default_metadata()
+        expected_metadata = IntegtestWorkspace.get_default_metadata()
         self.assertEqual(metadata, expected_metadata)
 
 

env/integtest_util.py

@@ -56,12 +56,6 @@ def get_workspace_path() -> Path:
         with open(IntegtestWorkspace.ENV_INTEGTESTS_DBGYM_CONFIG_FPATH) as f:
             return Path(yaml.safe_load(f)["dbgym_workspace_path"])
 
-
-class MockTuningAgent(TuningAgent):
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-        self.config_to_return: Optional[DBMSConfigDelta] = None
-
     @staticmethod
     def get_default_metadata() -> TuningAgentMetadata:
         dbgym_cfg = IntegtestWorkspace.get_dbgym_cfg()
@@ -94,8 +88,14 @@ def get_default_metadata() -> TuningAgentMetadata:
             ),
         )
 
+
+class MockTuningAgent(TuningAgent):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.config_to_return: Optional[DBMSConfigDelta] = None
+
     def _get_metadata(self) -> TuningAgentMetadata:
-        return MockTuningAgent.get_default_metadata()
+        return IntegtestWorkspace.get_default_metadata()
 
     def _step(self) -> DBMSConfigDelta:
         assert self.config_to_return is not None