diff --git a/agbenchmark/mocks/tests/basic_mocks.py b/agbenchmark/mocks/tests/basic_mocks.py index bbff6a9c..550095b7 100644 --- a/agbenchmark/mocks/tests/basic_mocks.py +++ b/agbenchmark/mocks/tests/basic_mocks.py @@ -7,8 +7,6 @@ def basic_read_file_mock(task: str, workspace: str): This mock reads a file and returns its content. """ - # Challenge.write_to_file(workspace, "file_to_check.txt", "this is how we're doing") - file_contents = Challenge.open_file(workspace, "file_to_check.txt") Challenge.write_to_file( diff --git a/agbenchmark/tests/basic_abilities/read_file/read_file_test.py b/agbenchmark/tests/basic_abilities/read_file/read_file_test.py index 35d1d80c..ea794281 100644 --- a/agbenchmark/tests/basic_abilities/read_file/read_file_test.py +++ b/agbenchmark/tests/basic_abilities/read_file/read_file_test.py @@ -25,6 +25,7 @@ class TestReadFile(Challenge): indirect=True, ) @pytest.mark.basic + @pytest.mark.dependency(depends=["write_file"]) def test_retrieval( self, workspace ): # create_file simply there for the function to depend on the fixture diff --git a/agbenchmark/tests/basic_abilities/write_file/write_file_test.py b/agbenchmark/tests/basic_abilities/write_file/write_file_test.py index ccb10fe7..b2c559c9 100644 --- a/agbenchmark/tests/basic_abilities/write_file/write_file_test.py +++ b/agbenchmark/tests/basic_abilities/write_file/write_file_test.py @@ -17,6 +17,7 @@ class TestWriteFile(Challenge): indirect=True, ) @pytest.mark.basic + @pytest.mark.dependency(name="write_file") def test_retrieval(self, workspace): file = self.open_file(workspace, data.ground.files[0]) diff --git a/agbenchmark/tests/regression/regression_tests.txt b/agbenchmark/tests/regression/regression_tests.txt index a5f8fbd1..84e625af 100644 --- a/agbenchmark/tests/regression/regression_tests.txt +++ b/agbenchmark/tests/regression/regression_tests.txt @@ -1,2 +1 @@ -agbenchmark/tests/basic_abilities/write_file/write_file_test.py::TestWriteFile::test_retrieval[server_response0] agbenchmark/tests/basic_abilities/read_file/read_file_test.py::TestReadFile::test_retrieval[server_response0] diff --git a/poetry.lock b/poetry.lock index 3f1059aa..3bc37622 100644 --- a/poetry.lock +++ b/poetry.lock @@ -595,6 +595,19 @@ tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +[[package]] +name = "pytest-dependency" +version = "0.5.1" +description = "Manage dependencies of tests" +optional = false +python-versions = "*" +files = [ + {file = "pytest-dependency-0.5.1.tar.gz", hash = "sha256:c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"}, +] + +[package.dependencies] +pytest = ">=3.6.0" + [[package]] name = "requests" version = "2.31.0" @@ -765,4 +778,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "a13e69f2bd9e511e1af92ed02b155a90dec38a9b8d983a711e1b67931b467d38" +content-hash = "4a1629eb643b5b68d47f6d1407942aa6d4a796c6d5a1b6a54bbc096b9d0efa2d" diff --git a/pyproject.toml b/pyproject.toml index 6f79e75c..087ac844 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,6 +14,7 @@ click = "^8.1.3" requests = "^2.31.0" openai = "^0.27.8" pydantic = "^1.10.9" +pytest-dependency = "^0.5.1" [build-system]