further test simplifications

Author: wxtim

tests/conftest.py

@@ -197,8 +197,6 @@ async def _inner(srcpath, args=None, n_args=3):
         if n_args == 2:
             # Don't include the parser:
             await script(options, str(srcpath))
-        output.ret = 0
-        output.exc = ''
 
         output.logging = '\n'.join([i.message for i in caplog.records])
         output.out, output.err = capsys.readouterr()
@@ -347,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

@@ -66,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(

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.