Merge pull request #108 from QCoDeS/dv/move_tests

Move tests into package to include them into distribution
QCoDeS · Jun 3, 2022 · b73dd8d · b73dd8d
2 parents 0e57973 + 7d553cf
commit b73dd8d
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 8 deletions.
diff --git a/.github/static/environment_forge_full.yml b/.github/static/environment_forge_full.yml
@@ -10,7 +10,7 @@ dependencies:
  - matplotlib>=2.2.3
  - schema
  # test requirements
- - hypothesis>=5.49.0
+ - hypothesis==6.46.7
  - pytest>=6.0.0
  - mypy
  - mypy_extensions

diff --git a/.github/workflows/conda-forge-install-and-test.yaml b/.github/workflows/conda-forge-install-and-test.yaml
@@ -45,4 +45,4 @@ jobs:
     - name: run pytest
       shell: bash -l {0}
       run: |
-         pytest --hypothesis-profile ci
+         pytest --hypothesis-profile ci broadbean
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -50,7 +50,7 @@ jobs:
       run: mypy broadbean
     - name: Run tests
       run: |
-        pytest --cov=broadbean --cov-report xml --hypothesis-profile ci
+        pytest --cov=broadbean --cov-report xml --hypothesis-profile ci broadbean
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3.1.0
       with:

diff --git a/broadbean/tests/__init__.py b/broadbean/tests/__init__.py
diff --git a/tests/conftest.py → broadbean/tests/conftest.py b/tests/conftest.py → broadbean/tests/conftest.py
diff --git a/tests/test_awgfilegeneration.py → broadbean/tests/test_awgfilegeneration.py b/tests/test_awgfilegeneration.py → broadbean/tests/test_awgfilegeneration.py
diff --git a/tests/test_blueprint.py → broadbean/tests/test_blueprint.py b/tests/test_blueprint.py → broadbean/tests/test_blueprint.py
diff --git a/tests/test_element.py → broadbean/tests/test_element.py b/tests/test_element.py → broadbean/tests/test_element.py
@@ -119,8 +119,8 @@ def test_addArray():
 
 
 @settings(max_examples=25, suppress_health_check=(HealthCheck.function_scoped_fixture,))
-@given(SR1=hst.integers(min_value=1,max_value=25e8), SR2=hst.integers(min_value = 1,max_value = 25e8),
-       N=hst.integers(min_value=2,max_value=25e6), M=hst.integers(min_value=2,max_value=25e6))
+@given(SR1=hst.integers(min_value=1,max_value=25*10**8), SR2=hst.integers(min_value = 1,max_value = 25*10**8),
+       N=hst.integers(min_value=2,max_value=25*10**6), M=hst.integers(min_value=2,max_value=25*10**6))
 def test_invalid_durations(SR1, SR2, N, M):
     """
     There are soooo many ways to have invalid durations, here
@@ -208,7 +208,7 @@ def test_input_fail1(improper_bp):
 
 
 @settings(max_examples=25, suppress_health_check=(HealthCheck.function_scoped_fixture,))
-@given(SR=hst.integers(min_value=1,max_value=25e8), N=hst.integers(min_value=2,max_value=25e6))
+@given(SR=hst.integers(min_value=1,max_value=25*10**8), N=hst.integers(min_value=2,max_value=25*10**6))
 def test_points(SR, N):
     elem = Element()
 

diff --git a/tests/test_forging.py → broadbean/tests/test_forging.py b/tests/test_forging.py → broadbean/tests/test_forging.py
@@ -65,7 +65,7 @@ def _has_period(array: np.ndarray, period: int) -> bool:
     return True
 
 
-@given(SR=hst.integers(min_value=100, max_value=50e9),
+@given(SR=hst.integers(min_value=100, max_value=50*10**9),
        ratio=hst.floats(min_value=1e-6, max_value=10))
 def test_too_short_durations_rejected(SR, ratio):
 

diff --git a/tests/test_sequence.py → broadbean/tests/test_sequence.py b/tests/test_sequence.py → broadbean/tests/test_sequence.py
diff --git a/tests/test_subsequences.py → broadbean/tests/test_subsequences.py b/tests/test_subsequences.py → broadbean/tests/test_subsequences.py
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1,4 +1,4 @@
-hypothesis
+hypothesis==6.46.7
 pytest
 pytest-cov
 coverage[toml]