testing aaaaaaaaaa

aaaaaaaaaaaaaaaaaaaaa

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>

Author: ShadowCurse

tests/conftest.py

@@ -171,21 +171,8 @@ def pytest_runtest_logreport(report):
     METRICS.flush()
 
 
-@pytest.fixture
-def test_output_dir(results_dir, request):
-    """Create and return a test specific directory"""
-    if results_dir is None:
-        return None
-
-    raw_data_path = Path(results_dir / request.node.name)
-    if raw_data_path.is_dir():
-        shutil.rmtree(raw_data_path)
-    raw_data_path.mkdir(parents=True, exist_ok=True)
-    return raw_data_path
-
-
 @pytest.fixture()
-def metrics(test_output_dir, request):
+def metrics(results_dir, request):
     """Fixture to pass the metrics scope
 
     We use a fixture instead of the @metrics_scope decorator as that conflicts
@@ -201,8 +188,8 @@ def metrics(test_output_dir, request):
         metrics_logger.set_property(prop_name, prop_val)
     yield metrics_logger
     metrics_logger.flush()
-    if test_output_dir:
-        metrics_logger.store_data(test_output_dir)
+    if results_dir:
+        metrics_logger.store_data(results_dir)
 
 
 @pytest.fixture
@@ -406,21 +393,27 @@ def results_dir(request):
     """
     Fixture yielding the path to a directory into which the test can dump its results
 
-    Directories are unique per test, and named after the test name. Everything the tests puts
-    into its directory will to be uploaded to S3. Directory will be placed inside defs.TEST_RESULTS_DIR.
+    Directories are unique per test, and their names include test name and test parameters.
+    Everything the tests puts into its directory will to be uploaded to S3.
+    Directory will be placed inside defs.TEST_RESULTS_DIR.
 
     For example
     ```py
-    def test_my_file(reggsults_dir):
+    @pytest.mark.parametrize("p", ["a", "b"])
+    def test_my_file(p, results_dir):
         (results_dir / "output.txt").write_text("Hello World")
     ```
-    will result in `defs.TEST_RESULTS_DIR`/test_my_file/output.txt.
+    will result in:
+    - `defs.TEST_RESULTS_DIR`/test_my_file/test_my_file[a]/output.txt.
+    - `defs.TEST_RESULTS_DIR`/test_my_file/test_my_file[b]/output.txt.
 
     When this fixture is called with DoctestItem as a request.node
     during doc tests, it will return None.
     """
     try:
-        results_dir = defs.TEST_RESULTS_DIR / request.node.originalname
+        results_dir = (
+            defs.TEST_RESULTS_DIR / request.node.originalname / request.node.name
+        )
     except AttributeError:
         return None
     results_dir.mkdir(parents=True, exist_ok=True)