shut down server and exit pytest when test fails (#53)

tests/test_build.py

@@ -57,7 +57,6 @@ def test_rpc_build_threads(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         # first run dbt to get the model built
@@ -102,7 +101,6 @@ def test_rpc_build_state(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         state_dir = os.path.join(project_root, 'state')
@@ -176,7 +174,6 @@ def test_rpc_build_selectors(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         # test simple resource_types param

tests/test_compile.py

@@ -20,7 +20,6 @@ def test_rpc_compile_threads(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         results = querier.async_wait_for_result(querier.compile(threads=5))
@@ -42,7 +41,6 @@ def test_rpc_compile_state(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         state_dir = os.path.join(project_root, 'state')

tests/test_concurrency.py

@@ -28,7 +28,6 @@ def test_rpc_compile_sql_concurrency(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:

tests/test_deps.py

@@ -91,7 +91,6 @@ def test_rpc_deps_packages(project_root, profiles_root, dbt_profile, unique_sche
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
         criteria='error',
     )
     with querier_ctx as querier:
@@ -162,7 +161,6 @@ def test_rpc_deps_after_list(project_root, profiles_root, dbt_profile, unique_sc
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
         criteria='error',
     )
     with querier_ctx as querier:

tests/test_management.py

@@ -18,7 +18,6 @@ def test_rpc_basics(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -77,7 +76,6 @@ def test_rpc_status_error(project_root, profiles_root, dbt_profile, unique_schem
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
         criteria='error',
     )
     with querier_ctx as querier:
@@ -143,7 +141,6 @@ def test_gc_change_interval(project_root, profiles_root, dbt_profile, unique_sch
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -190,7 +187,6 @@ def test_ps_poll_output_match(project_root, profiles_root, dbt_profile, unique_s
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -265,7 +261,6 @@ def test_get_status(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -314,7 +309,6 @@ def test_missing_tag_sighup(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         # everything is fine
@@ -354,7 +348,6 @@ def test_get_manifest(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:

tests/test_run.py

@@ -20,7 +20,6 @@ def test_rpc_run_threads(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         results = querier.async_wait_for_result(querier.run(threads=5))
@@ -46,7 +45,6 @@ def test_rpc_run_vars(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -70,7 +68,6 @@ def test_rpc_run_vars_compiled(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         results = querier.async_wait_for_result(querier.cli_args('--no-partial-parse run --vars "{materialized_var: table}"'))
@@ -93,7 +90,6 @@ def test_rpc_run_state_defer(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         state_dir = os.path.join(project_root, 'state')

tests/test_run_operation.py

@@ -33,7 +33,6 @@ def test_run_operation(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -80,7 +79,6 @@ def test_run_operation_cli(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:

tests/test_run_sql.py

@@ -18,7 +18,6 @@ def test_rpc_run_sql_nohang(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         querier.async_wait_for_result(querier.run_sql('select 1 as id'))

tests/test_seed.py

@@ -21,7 +21,6 @@ def test_rpc_seed_threads(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -50,7 +49,6 @@ def test_rpc_seed_include_exclude(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -79,7 +77,6 @@ def test_rpc_seed_state(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         state_dir = os.path.join(project_root, 'state')

tests/test_snapshots.py

@@ -54,7 +54,6 @@ def test_snapshots(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -83,7 +82,6 @@ def test_snapshots_cli(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -115,7 +113,6 @@ def test_rpc_snapshot_threads(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -140,7 +137,6 @@ def test_rpc_snapshot_state(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         state_dir = os.path.join(project_root, 'state')
@@ -169,4 +165,4 @@ def test_rpc_snapshot_state(
         results = querier.async_wait_for_result(
             querier.snapshot(state='./state', select=['state:modified']),
         )
-        assert len(results['results']) == 0
+        assert len(results['results']) == 0

tests/test_source_freshness.py

@@ -44,7 +44,6 @@ def test_source_snapshot_freshness(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:
@@ -105,7 +104,6 @@ def test_source_freshness(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
 
     with querier_ctx as querier:

tests/test_test.py

@@ -35,7 +35,6 @@ def test_rpc_test_threads(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         # first run dbt to get the model built
@@ -77,7 +76,6 @@ def test_rpc_test_state(
         project_dir=project_root,
         profiles_dir=profiles_root,
         schema=unique_schema,
-        test_kwargs={},
     )
     with querier_ctx as querier:
         state_dir = os.path.join(project_root, 'state')

tests/util.py

@@ -1,7 +1,6 @@
 import base64
 import json
 import os
-import pytest
 import random
 import signal
 import socket
@@ -542,10 +541,12 @@ def rpc_server(
     cli_vars = '{{test_run_schema: {}}}'.format(schema)
 
     proc = _first_server(project_dir, cli_vars, profiles_dir, criteria, target)
-    yield proc
-    if proc.is_alive():
-        os.kill(proc.pid, signal.SIGKILL)
-        proc.join()
+    try:
+        yield proc
+    finally:
+        if proc.is_alive():
+            os.kill(proc.pid, signal.SIGKILL)
+            proc.join()
 
 
 class ProjectDefinition:
@@ -665,9 +666,9 @@ def execute(adapter, sql):
 
 
 @contextmanager
-def built_schema(project_dir, schema, profiles_dir, test_kwargs, project_def):
+def built_schema(project_dir, schema, profiles_dir, project_def):
     # make our args, write our project out
-    args = TestArgs(profiles_dir=profiles_dir, kwargs=test_kwargs)
+    args = TestArgs(profiles_dir=profiles_dir)
     project_def.write_to(project_dir)
     # build a config of our own
     os.chdir(project_dir)
@@ -692,7 +693,6 @@ def get_querier(
     project_dir,
     profiles_dir,
     schema,
-    test_kwargs,
     criteria='ready',
     target=None,
 ):
@@ -702,7 +702,7 @@ def get_querier(
     )
     schema_ctx = built_schema(
         project_dir=project_dir, schema=schema, profiles_dir=profiles_dir,
-        test_kwargs={}, project_def=project_def,
+        project_def=project_def,
     )
     with schema_ctx, server_ctx as server:
         yield Querier(server)