also set cwd

Author: alexeagle

examples/pytest/BUILD.bazel

@@ -1,36 +1,24 @@
-load("@aspect_rules_py//py:defs.bzl", "py_library", "py_pytest_main", "py_test")
+load("@aspect_rules_py//py:defs.bzl", "py_library", "py_test")
 
 py_library(
     name = "lib",
     srcs = ["foo.py"],
     imports = ["../.."],
 )
 
-py_pytest_main(
-    name = "__test__",
-    chdir = package_name(),  # So that test fixtures are available at the correct path
-    deps = [
-        "@pypi_coverage//:pkg",
-        "@pypi_pytest//:pkg",
-    ],
-)
-
 py_test(
     name = "pytest_test",
-    srcs = [
-        "foo_test.py",
-        ":__test__",
-    ],
+    srcs = ["foo_test.py"],
     data = glob([
         "fixtures/*.json",
     ]),
     env_inherit = ["FOO"],
     imports = ["../.."],
-    main = ":__test__.py",
     package_collisions = "warning",
+    pytest_main = True,
     deps = [
-        ":__test__",
         ":lib",
+        "@pypi_coverage//:pkg",
         "@pypi_ftfy//:pkg",
         "@pypi_neptune//:pkg",
         "@pypi_pytest//:pkg",
@@ -40,15 +28,10 @@ py_test(
 py_test(
     # NB: name contains a slash as regression test for #483
     name = "sharded/test",
-    srcs = [
-        "__test__.py",
-        "sharding_test.py",
-    ],
+    srcs = ["sharding_test.py"],
     imports = ["../.."],
-    main = "__test__.py",
     package_collisions = "warning",
+    pytest_main = True,
     shard_count = 2,
-    deps = [
-        "__test__",
-    ],
+    deps = ["@pypi_pytest//:pkg"],
 )

py/defs.bzl

@@ -147,7 +147,11 @@ def py_test(name, srcs = [], main = None, pytest_main = False, **kwargs):
             fail("When pytest_main is set, the main attribute should not be set.")
         pytest_main_target = name + ".pytest_main"
         main = pytest_main_target + ".py"
-        py_pytest_main(name = pytest_main_target)
+        py_pytest_main(
+            name = pytest_main_target,
+            # Ensure that test fixtures are available at the expected path
+            chdir = native.package_name(),
+        )
         srcs.append(main)
         deps.append(pytest_main_target)
 

py/private/pytest.py.tmpl

@@ -17,7 +17,12 @@ import os
 from pathlib import Path
 from typing import List
 
-import pytest
+try:
+    import pytest
+except ModuleNotFoundError as e:
+    print("ERROR: pytest must be included in the deps of the py_test target")
+    raise e
+
 # None means coverage wasn't enabled
 cov = None