refactored ivy_tests package (#13186)

* refactored ivy_tests package * update submodule index * new line in conftest
ivy-llc · Mar 26, 2023 · 72bcd06 · 72bcd06
1 parent 67f2b3a
commit 72bcd06
Show file tree

Hide file tree

Showing 25 changed files with 511 additions and 507 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 
-[submodule "ivy_tests/test_array_api"]
-	path = ivy_tests/test_array_api
+[submodule "ivy_tests/array_api_testing/test_array_api"]
+	path = ivy_tests/array_api_testing/test_array_api
 	url = https://github.com/data-apis/array-api-tests.git
diff --git a/ivy_tests/array_api_testing/__init__.py b/ivy_tests/array_api_testing/__init__.py
diff --git a/...rray_api_methods_to_test/array_object.txt → ...rray_api_methods_to_test/array_object.txt b/...rray_api_methods_to_test/array_object.txt → ...rray_api_methods_to_test/array_object.txt
diff --git a/...s/array_api_methods_to_test/constants.txt → ...g/array_api_methods_to_test/constants.txt b/...s/array_api_methods_to_test/constants.txt → ...g/array_api_methods_to_test/constants.txt
diff --git a/...pi_methods_to_test/creation_functions.txt → ...pi_methods_to_test/creation_functions.txt b/...pi_methods_to_test/creation_functions.txt → ...pi_methods_to_test/creation_functions.txt
diff --git a/...i_methods_to_test/data_type_functions.txt → ...i_methods_to_test/data_type_functions.txt b/...i_methods_to_test/data_type_functions.txt → ...i_methods_to_test/data_type_functions.txt
diff --git a/...methods_to_test/elementwise_functions.txt → ...methods_to_test/elementwise_functions.txt b/...methods_to_test/elementwise_functions.txt → ...methods_to_test/elementwise_functions.txt
diff --git a/...s/array_api_methods_to_test/has_names.txt → ...g/array_api_methods_to_test/has_names.txt b/...s/array_api_methods_to_test/has_names.txt → ...g/array_api_methods_to_test/has_names.txt
diff --git a/...ay_api_methods_to_test/linear_algebra.txt → ...ay_api_methods_to_test/linear_algebra.txt b/...ay_api_methods_to_test/linear_algebra.txt → ...ay_api_methods_to_test/linear_algebra.txt
diff --git a/...ethods_to_test/manipulation_functions.txt → ...ethods_to_test/manipulation_functions.txt b/...ethods_to_test/manipulation_functions.txt → ...ethods_to_test/manipulation_functions.txt
diff --git a/...i_methods_to_test/searching_functions.txt → ...i_methods_to_test/searching_functions.txt b/...i_methods_to_test/searching_functions.txt → ...i_methods_to_test/searching_functions.txt
diff --git a/...ray_api_methods_to_test/set_functions.txt → ...ray_api_methods_to_test/set_functions.txt b/...ray_api_methods_to_test/set_functions.txt → ...ray_api_methods_to_test/set_functions.txt
diff --git a/.../array_api_methods_to_test/signatures.txt → .../array_api_methods_to_test/signatures.txt b/.../array_api_methods_to_test/signatures.txt → .../array_api_methods_to_test/signatures.txt
diff --git a/...api_methods_to_test/sorting_functions.txt → ...api_methods_to_test/sorting_functions.txt b/...api_methods_to_test/sorting_functions.txt → ...api_methods_to_test/sorting_functions.txt
diff --git a/...ray_api_methods_to_test/special_cases.txt → ...ray_api_methods_to_test/special_cases.txt b/...ray_api_methods_to_test/special_cases.txt → ...ray_api_methods_to_test/special_cases.txt
diff --git a/...methods_to_test/statistical_functions.txt → ...methods_to_test/statistical_functions.txt b/...methods_to_test/statistical_functions.txt → ...methods_to_test/statistical_functions.txt
diff --git a/...ay_api_methods_to_test/type_promotion.txt → ...ay_api_methods_to_test/type_promotion.txt b/...ay_api_methods_to_test/type_promotion.txt → ...ay_api_methods_to_test/type_promotion.txt
diff --git a/...api_methods_to_test/utility_functions.txt → ...api_methods_to_test/utility_functions.txt b/...api_methods_to_test/utility_functions.txt → ...api_methods_to_test/utility_functions.txt
diff --git a/ivy_tests/array_api_testing/conftest.py b/ivy_tests/array_api_testing/conftest.py
@@ -0,0 +1,22 @@
+from pytest import mark
+from pathlib import Path
+
+
+skip_ids = []
+skips_path = Path(__file__).parent / "skips.txt"
+if skips_path.exists():
+    with open(skips_path) as f:
+        for line in f:
+            if line.startswith("ivy_tests"):
+                id_ = line.strip("\n")
+                skip_ids.append(id_)
+
+
+def pytest_collection_modifyitems(items):
+    skip_ivy = mark.skip(reason="ivy skip - see ivy_tests/skips.txt for details")
+    for item in items:
+        # skip if specified in skips.txt
+        for id_ in skip_ids:
+            if item.nodeid.startswith(id_):
+                item.add_marker(skip_ivy)
+                break
diff --git a/ivy_tests/array_api_testing/skips.txt b/ivy_tests/array_api_testing/skips.txt
diff --git a/ivy_tests/test_array_api → ivy_tests/array_api_testing/test_array_api b/ivy_tests/test_array_api → ivy_tests/array_api_testing/test_array_api
diff --git a/ivy_tests/write_array_api_tests_k_flag.py → ...i_testing/write_array_api_tests_k_flag.py b/ivy_tests/write_array_api_tests_k_flag.py → ...i_testing/write_array_api_tests_k_flag.py
diff --git a/ivy_tests/conftest.py b/ivy_tests/conftest.py
@@ -8,8 +8,7 @@
     DirectoryBasedExampleDatabase,
 )
 from hypothesis.extra.redis import RedisExampleDatabase
-from pytest import mark
-from pathlib import Path
+
 
 
 hypothesis_cache = os.getcwd() + "/.hypothesis/examples/"
@@ -118,21 +117,4 @@ def pytest_configure(config):
     settings.load_profile("ivy_profile")
 
 
-skip_ids = []
-skips_path = Path(__file__).parent / "skips.txt"
-if skips_path.exists():
-    with open(skips_path) as f:
-        for line in f:
-            if line.startswith("ivy_tests"):
-                id_ = line.strip("\n")
-                skip_ids.append(id_)
-
-
-def pytest_collection_modifyitems(items):
-    skip_ivy = mark.skip(reason="ivy skip - see ivy_tests/skips.txt for details")
-    for item in items:
-        # skip if specified in skips.txt
-        for id_ in skip_ids:
-            if item.nodeid.startswith(id_):
-                item.add_marker(skip_ivy)
-                break
+
diff --git a/ivy_tests/skips.txt b/ivy_tests/skips.txt
diff --git a/run_tests_CLI/test_array_api.sh b/run_tests_CLI/test_array_api.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
-python3 ivy_tests/write_array_api_tests_k_flag.py
+python3 ivy_tests/array_api_testing/write_array_api_tests_k_flag.py
 # shellcheck disable=SC2155
-export ARRAY_API_TESTS_K_FLAG=$(cat ivy_tests/.array_api_tests_k_flag_$1)
+export ARRAY_API_TESTS_K_FLAG=$(cat ivy_tests/array_api_testing/.array_api_tests_k_flag_$1)
 if [ "$1" = "torch" ]; then
   ARRAY_API_TESTS_K_FLAG="${ARRAY_API_TESTS_K_FLAG} and not (uint16 or uint32 or uint64)"
 fi
 
 mkdir -p .hypothesis
 # shellcheck disable=SC2046
-docker run --rm --env IVY_BACKEND="$1" --env ARRAY_API_TESTS_MODULE="ivy" --env REDIS_URL="$3" --env REDIS_PASSWD="$4" -v $(pwd):/ivy -v $(pwd)/.hypothesis:/.hypothesis unifyai/ivy:latest python3 -m pytest ivy_tests/test_array_api/array_api_tests/"$2".py -k "$ARRAY_API_TESTS_K_FLAG" --tb=short -vv
+docker run --rm --env IVY_BACKEND="$1" --env ARRAY_API_TESTS_MODULE="ivy" --env REDIS_URL="$3" --env REDIS_PASSWD="$4" -v $(pwd):/ivy -v $(pwd)/.hypothesis:/.hypothesis unifyai/ivy:latest python3 -m pytest ivy_tests/array_api_testing/test_array_api/array_api_tests/"$2".py -k "$ARRAY_API_TESTS_K_FLAG" --tb=short -vv