Merge pull request #868 from openfisca/fix-test-runner

Fix test runner

Author: Morendil

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 34.0.1
+
+#### Bug fix
+
+- Allow both `*.yaml` and `*.yml` extensions for YAML tests
+
 # 34.0.0
 
 #### Technical changes

openfisca_core/tools/test_runner.py

@@ -224,7 +224,7 @@ def __init__(self, tax_benefit_system, options):
         self.options = options
 
     def pytest_collect_file(self, parent, path):
-        if path.ext == ".yaml":
+        if path.ext in [".yaml", ".yml"]:
             return YamlFile(path, parent, self.tax_benefit_system, self.options)
 
 

setup.py

@@ -36,7 +36,7 @@
 
 setup(
     name = 'OpenFisca-Core',
-    version = '34.0.0',
+    version = '34.0.1',
     author = 'OpenFisca Team',
     author_email = '[email protected]',
     classifiers = [

tests/core/test_yaml.py

@@ -29,7 +29,7 @@ def run_yaml_test(path, options = None):
 
 
 def test_success():
-    assert run_yaml_test('test_success.yaml') == EXIT_OK
+    assert run_yaml_test('test_success.yml') == EXIT_OK
 
 
 def test_fail():
@@ -81,7 +81,7 @@ def test_name_filter():
 
 
 def test_shell_script():
-    yaml_path = os.path.join(yaml_tests_dir, 'test_success.yaml')
+    yaml_path = os.path.join(yaml_tests_dir, 'test_success.yml')
     command = ['openfisca', 'test', yaml_path, '-c', 'openfisca_country_template']
     with open(os.devnull, 'wb') as devnull:
         subprocess.check_call(command, stdout = devnull, stderr = devnull)