Fix yaml tests bug

openfisca · Sep 29, 2021 · 1f9e523 · 1f9e523
1 parent 195fa72
commit 1f9e523
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 3 deletions.
diff --git a/tests/core/test_yaml.py b/tests/core/test_yaml.py
@@ -1,4 +1,3 @@
-import pkg_resources
 import os
 import subprocess
 
@@ -7,9 +6,9 @@
 
 from openfisca_core.tools.test_runner import run_tests
 
+from tests.fixtures import yaml_tests
 
-openfisca_core_dir = pkg_resources.get_distribution('OpenFisca-Core').location
-yaml_tests_dir = os.path.join(openfisca_core_dir, 'tests', 'core', 'yaml_tests')
+yaml_tests_dir = os.path.dirname(yaml_tests.__file__)
 EXIT_OK = 0
 EXIT_TESTSFAILED = 1
 

diff --git a/tests/fixtures/yaml_tests/__init__.py b/tests/fixtures/yaml_tests/__init__.py
diff --git a/..._tests/directory/subdirectory/test_4.yaml → ..._tests/directory/subdirectory/test_4.yaml b/..._tests/directory/subdirectory/test_4.yaml → ..._tests/directory/subdirectory/test_4.yaml
diff --git a/tests/core/yaml_tests/directory/test_1.yaml → ...fixtures/yaml_tests/directory/test_1.yaml b/tests/core/yaml_tests/directory/test_1.yaml → ...fixtures/yaml_tests/directory/test_1.yaml
diff --git a/tests/core/yaml_tests/directory/test_2.yaml → ...fixtures/yaml_tests/directory/test_2.yaml b/tests/core/yaml_tests/directory/test_2.yaml → ...fixtures/yaml_tests/directory/test_2.yaml
diff --git a/...s/failing_test_absolute_error_margin.yaml → ...s/failing_test_absolute_error_margin.yaml b/...s/failing_test_absolute_error_margin.yaml → ...s/failing_test_absolute_error_margin.yaml
diff --git a/...s/failing_test_relative_error_margin.yaml → ...s/failing_test_relative_error_margin.yaml b/...s/failing_test_relative_error_margin.yaml → ...s/failing_test_relative_error_margin.yaml
diff --git a/...aml_tests/test_absolute_error_margin.yaml → ...aml_tests/test_absolute_error_margin.yaml b/...aml_tests/test_absolute_error_margin.yaml → ...aml_tests/test_absolute_error_margin.yaml
diff --git a/tests/core/yaml_tests/test_failure.yaml → tests/fixtures/yaml_tests/test_failure.yaml b/tests/core/yaml_tests/test_failure.yaml → tests/fixtures/yaml_tests/test_failure.yaml
diff --git a/tests/core/yaml_tests/test_name_filter.yaml → ...fixtures/yaml_tests/test_name_filter.yaml b/tests/core/yaml_tests/test_name_filter.yaml → ...fixtures/yaml_tests/test_name_filter.yaml
diff --git a/...aml_tests/test_relative_error_margin.yaml → ...aml_tests/test_relative_error_margin.yaml b/...aml_tests/test_relative_error_margin.yaml → ...aml_tests/test_relative_error_margin.yaml
diff --git a/tests/core/yaml_tests/test_success.yml → tests/fixtures/yaml_tests/test_success.yml b/tests/core/yaml_tests/test_success.yml → tests/fixtures/yaml_tests/test_success.yml
diff --git a/tests/core/yaml_tests/test_with_anchors.yaml → ...ixtures/yaml_tests/test_with_anchors.yaml b/tests/core/yaml_tests/test_with_anchors.yaml → ...ixtures/yaml_tests/test_with_anchors.yaml
diff --git a/.../core/yaml_tests/test_with_extension.yaml → ...tures/yaml_tests/test_with_extension.yaml b/.../core/yaml_tests/test_with_extension.yaml → ...tures/yaml_tests/test_with_extension.yaml
diff --git a/tests/core/yaml_tests/test_with_reform.yaml → ...fixtures/yaml_tests/test_with_reform.yaml b/tests/core/yaml_tests/test_with_reform.yaml → ...fixtures/yaml_tests/test_with_reform.yaml
diff --git a/...s/core/yaml_tests/test_with_reform_2.yaml → ...xtures/yaml_tests/test_with_reform_2.yaml b/...s/core/yaml_tests/test_with_reform_2.yaml → ...xtures/yaml_tests/test_with_reform_2.yaml