Skip to content

Commit

Permalink
run functional + adapter tests prior to test/integration
Browse files Browse the repository at this point in the history
  • Loading branch information
MichelleArk committed Dec 13, 2022
1 parent e80f505 commit 5a1c687
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions core/dbt/cli/params.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,15 @@
"--profiles-dir",
envvar="DBT_PROFILES_DIR",
help="Which directory to look in for the profiles.yml file. If not set, dbt will look in the current working directory first, then HOME/.dbt/",
default=lambda: default_profiles_dir(),
default=default_profiles_dir,
type=click.Path(exists=True),
)

project_dir = click.option(
"--project-dir",
envvar=None,
help="Which directory to look in for the dbt_project.yml file. Default is the current working directory and its parents.",
default=lambda: default_project_dir(),
default=default_project_dir,
type=click.Path(exists=True),
)

Expand Down
4 changes: 2 additions & 2 deletions core/dbt/cli/requires.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def wrapper(*args, **kwargs):

if ctx.obj.get("profile") is None:
flags = ctx.obj["flags"]
# TODO: Generalize safe access to flags.THREADS:
# TODO: Generalize safe access to flags.THREADS:
# https://github.com/dbt-labs/dbt-core/issues/6259
threads = getattr(flags, "THREADS", None)
profile = load_profile(
Expand Down Expand Up @@ -82,4 +82,4 @@ def wrapper(*args, **kwargs):

return func(*args, **kwargs)

return wrapper
return wrapper
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ passenv =
POSTGRES_TEST_*
PYTEST_ADDOPTS
commands =
{envpython} -m pytest --cov=core -m profile_postgres {posargs} test/integration
{envpython} -m pytest --cov=core {posargs} tests/functional
{envpython} -m pytest --cov=core {posargs} tests/adapter
{envpython} -m pytest --cov=core -m profile_postgres {posargs} test/integration


deps =
-rdev-requirements.txt
Expand Down

0 comments on commit 5a1c687

Please sign in to comment.