MAINT Move package tests under packages/ dir (#471)

* Move package tests under the packages/ folder * Fix tests
pyodide · Jun 19, 2019 · 2cf8639 · 2cf8639
1 parent 6898c87
commit 2cf8639
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -56,7 +56,7 @@ jobs:
       - run:
           name: test
           command: |
-            pytest test pyodide_build -v -k firefox
+            pytest test packages pyodide_build -v -k firefox
 
   test-chrome:
     <<: *defaults
@@ -67,7 +67,7 @@ jobs:
       - run:
           name: test
           command: |
-            pytest test pyodide_build -v -k chrome
+            pytest test packages pyodide_build -v -k chrome
 
   test-python:
     <<: *defaults

diff --git a/Makefile b/Makefile
@@ -111,7 +111,7 @@ build/webworker_dev.js: src/webworker.js
 	sed -i -e "s#pyodide.js#pyodide_dev.js#g" $@
 
 test: all
-	pytest test/ -v
+	pytest test packages pyodide_build -v
 
 
 lint:

diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ Install [geckodriver](https://github.com/mozilla/geckodriver/releases) and
 [chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) somewhere
 on your `PATH`.
 
-`pytest test/`
+`pytest test/ packages/`
 
 # Manual Testing
 

diff --git a/test/conftest.py → conftest.py b/test/conftest.py → conftest.py
@@ -13,10 +13,11 @@
 import sys
 import shutil
 
-TEST_PATH = pathlib.Path(__file__).parents[0].resolve()
-BUILD_PATH = TEST_PATH / '..' / 'build'
+ROOT_PATH = pathlib.Path(__file__).parents[0].resolve()
+TEST_PATH = ROOT_PATH / "test"
+BUILD_PATH = ROOT_PATH / 'build'
 
-sys.path.append(str(TEST_PATH / '..'))
+sys.path.append(str(ROOT_PATH))
 
 from pyodide_build._fixes import _selenium_is_connectable  # noqa: E402
 import selenium.webdriver.common.utils  # noqa: E402

diff --git a/test/test_jinja2.py → packages/Jinja2/test_jinja2.py b/test/test_jinja2.py → packages/Jinja2/test_jinja2.py
diff --git a/test/packages/test_joblib.py → packages/joblib/test_joblib.py b/test/packages/test_joblib.py → packages/joblib/test_joblib.py
diff --git a/test/test_matplotlib.py → packages/matplotlib/test_matplotlib.py b/test/test_matplotlib.py → packages/matplotlib/test_matplotlib.py
diff --git a/test/test_micropip.py → packages/micropip/test_micropip.py b/test/test_micropip.py → packages/micropip/test_micropip.py
diff --git a/test/packages/test_networkx.py → packages/networkx/test_networkx.py b/test/packages/test_networkx.py → packages/networkx/test_networkx.py
diff --git a/test/packages/test_numpy.py → packages/numpy/test_numpy.py b/test/packages/test_numpy.py → packages/numpy/test_numpy.py
diff --git a/test/packages/test_pandas.py → packages/pandas/test_pandas.py b/test/packages/test_pandas.py → packages/pandas/test_pandas.py
diff --git a/test/packages/test_scikit-learn.py → packages/scikit-learn/test_scikit-learn.py b/test/packages/test_scikit-learn.py → packages/scikit-learn/test_scikit-learn.py
diff --git a/test/packages/test_scipy.py → packages/scipy/test_scipy.py b/test/packages/test_scipy.py → packages/scipy/test_scipy.py
@@ -29,3 +29,9 @@ def test_scipy_linalg(selenium_standalone, request):
         """)
 
     selenium.run(cmd)
+
+
+def test_brentq(selenium_standalone):
+    selenium_standalone.load_package("scipy")
+    selenium_standalone.run("from scipy.optimize import brentq")
+    selenium_standalone.run("brentq(lambda x: x, -1, 1)")
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+norecursedirs = build src cpython emsdk/
diff --git a/test/test_scipy.py b/test/test_scipy.py