Merge pull request #400 from wxtim/tests.fix_broken

Test: Fix broken test

Author: MetRonnie

tests/conftest.py

@@ -192,17 +192,11 @@ async def _inner(srcpath, args=None, n_args=3):
         options = Options(parser, args)()
         output = SimpleNamespace()
 
-        try:
-            if n_args == 3:
-                await script(parser, options, str(srcpath))
-            if n_args == 2:
-                # Don't include the parser:
-                await script(options, str(srcpath))
-            output.ret = 0
-            output.exc = ''
-        except Exception as exc:
-            output.ret = 1
-            output.exc = exc
+        if n_args == 3:
+            await script(parser, options, str(srcpath))
+        if n_args == 2:
+            # Don't include the parser:
+            await script(options, str(srcpath))
 
         output.logging = '\n'.join([i.message for i in caplog.records])
         output.out, output.err = capsys.readouterr()
@@ -319,7 +313,7 @@ async def _inner(wid, args):
         for script_name, n_args in {
             'config': 3,
             'list': 2,
-            'graph': 3,
+            'graph': 2,
             'view': 2,
             'validate': 3,
         }.items():
@@ -351,9 +345,6 @@ async def _inner(wid, args):
                 script_module.get_option_parser,
             )(wid, args, n_args=n_args)
 
-        # Check outputs
-        assert all(output.ret == 0 for output in results.values())
-
         # Return results for more checking if required:
         return results
 

tests/functional/test_pre_configure.py

@@ -19,33 +19,24 @@
 from itertools import product
 import os
 from pathlib import Path
+import re
 from shlex import split
 from subprocess import run
 from types import SimpleNamespace
 
 import pytest
-from pytest import param
 
+from cylc.flow.exceptions import InputError
 from cylc.rose.entry_points import pre_configure
 from cylc.rose.utilities import NotARoseSuiteException, load_rose_config
 
 
-@pytest.mark.parametrize(
-    'srcdir, expect',
-    [
-        param(
-            '07_cli_override',
-            'failed 1.1\n(add --verbose for more context)',
-            id='template variable not set'
-        )
-    ]
-)
-async def test_validate_fail(srcdir, expect, cylc_validate_cli):
-    srcdir = Path(__file__).parent / srcdir
-    validate = await cylc_validate_cli(srcdir)
-    assert validate.ret == 1
-    if expect:
-        assert expect == str(validate.exc)
+async def test_validate_fail_tvar_not_set(cylc_validate_cli):
+    with pytest.raises(
+        InputError,
+        match=re.escape('failed 1.1\n(add --verbose for more context)')
+    ):
+        await cylc_validate_cli(Path(__file__).parent / '07_cli_override')
 
 
 @pytest.mark.parametrize(
@@ -75,8 +66,8 @@ async def test_validate(monkeypatch, srcdir, envvars, args, cylc_validate_cli):
     for key, value in (envvars or {}).items():
         monkeypatch.setenv(key, value)
     srcdir = Path(__file__).parent / srcdir
-    validate = await cylc_validate_cli(str(srcdir), args)
-    assert validate.ret == 0
+    # this is the test, we just asserting that this doesn't fail:
+    await cylc_validate_cli(str(srcdir), args)
 
 
 @pytest.mark.parametrize(
@@ -241,11 +232,14 @@ async def test_validate_against_source(
     await cylc_inspect_scripts(wid, {"against_source": True})
 
     # Reinstall fails if we clear rose install opts:
-    clear_install_validate = await cylc_validate_cli(
-        wid, {"against_source": True, 'clear_rose_install_opts': True}
-    )
-    assert clear_install_validate.ret != 0
-    assert 'Test --rose-template-variable' in str(clear_install_validate.exc)
+    with pytest.raises(InputError, match='Test --rose-template-variable'):
+        await cylc_validate_cli(
+            wid,
+            {
+                "against_source": True,
+                'clear_rose_install_opts': True
+            }
+        )
 
 
 def test_invalid_cli_opts(tmp_path, caplog):

tests/functional/test_reinstall.py

@@ -108,8 +108,7 @@ async def fixture_install_flow(
 async def test_cylc_validate(fixture_provide_flow, cylc_validate_cli):
     """Sanity check that workflow validates:
     """
-    srcpath = fixture_provide_flow['srcpath']
-    assert (await cylc_validate_cli(str(srcpath))).ret == 0
+    await cylc_validate_cli(str(fixture_provide_flow['srcpath']))
 
 
 @pytest.mark.parametrize(

tests/functional/test_utils.py

@@ -73,7 +73,6 @@ async def test_global_config_environment_validate(
 
     # Validate the config:
     output = await cylc_validate_cli(tmp_path)
-    assert output.ret == 0
 
     # CYLC_SYMLINKS == None the first time the global.cylc
     # is loaded and "Foo" the second time.

tox.ini

@@ -8,6 +8,9 @@ ignore=
     W504
     ; "experimental" SIM9xx rules (flake8-simplify)
     SIM9
+    ; not all exception subclass __init__ args passed to super __init__
+    ; see https://github.com/cylc/cylc-flow/issues/7059
+    B042
 
 exclude=
     build,