From 1c78a305354c0fb84ea36c8bd72d5443aea3c226 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Tue, 2 Mar 2021 19:32:02 -0800 Subject: [PATCH] Fix bug in makefile - Makefile no longer runs on virtual env modules - Update some function names so pyflakes doesn't error Co-authored-by: Micah Jerome Ellison --- Makefile | 2 +- tests/step_defs/conftest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1c8a52a6..8130dade 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ format: ## Format files to match style lint: ## Check style with various tools poetry check - poetry run pyflakes . + poetry run pyflakes jrnl tests poetry run black --check --diff . test: lint ## Run unit tests and behave tests diff --git a/tests/step_defs/conftest.py b/tests/step_defs/conftest.py index 031b96bd..6f86124b 100644 --- a/tests/step_defs/conftest.py +++ b/tests/step_defs/conftest.py @@ -153,7 +153,7 @@ def output_should_contain(output, cli_run): @then(parse("the output should not contain\n{output}")) @then(parse('the output should not contain "{output}"')) @then('the output should not contain ""') -def output_should_contain(output, cli_run): +def output_should_not_contain(output, cli_run): assert output not in cli_run["stdout"] @@ -169,7 +169,7 @@ def output_should_be(output, cli_run): @then('the output should contain the date ""') -def output_should_contain(output, cli_run): +def output_should_contain_date(output, cli_run): assert output and output in cli_run["stdout"]