Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin2/master' into feature/remote-con…
Browse files Browse the repository at this point in the history
…fig-files
  • Loading branch information
simojo committed Oct 27, 2023
2 parents f26a234 + d7a7bba commit f5e46c5
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 24 deletions.
22 changes: 11 additions & 11 deletions .chasten/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ checks:
pattern: './/ClassDef'
count:
min: 1
max: 50
max: null
- name: "all-function-definition"
code: "AFD"
id: "F001"
pattern: './/FunctionDef'
count:
min: 1
max: 200
- name: "non-test-function-definition"
max: null
- name: "dummy-test-non-test-function-definition"
code: "NTF"
id: "F002"
pattern: './/FunctionDef[not(contains(@name, "test_"))]'
count:
min: 40
max: 70
- name: "single-nested-if"
min: null
max: null
- name: "dummy-test-single-nested-if"
code: "SNI"
id: "CL001"
pattern: './/FunctionDef/body//If'
count:
min: 1
max: 100
- name: "double-nested-if"
min: null
max: null
- name: "dummy-test-double-nested-if"
code: "DNI"
id: "CL002"
pattern: './/FunctionDef/body//If[ancestor::If and not(parent::orelse)]'
count:
min: 1
max: 15
min: null
max: null
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ on:
# This job performs all necessary checks
jobs:
build:
# Use the latest version of Ubuntu on MacOS and Windows
# Use the latest version of Ubuntu, MacOS, and Windows
# Use the latest and most stable version of Python
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -53,7 +54,7 @@ jobs:
- name: Install Pip
if: always()
run: |
pip install -U pip
python -m pip install --upgrade pip
# Install poetry
- name: Install Poetry
if: always()
Expand All @@ -75,7 +76,6 @@ jobs:
if: always()
run: |
poetry run chasten analyze chasten --config $PWD/.chasten/ --debug-level ERROR --debug-dest CONSOLE --search-path .
# Run the tests
- name: Run Tests
if: always()
Expand Down
3 changes: 2 additions & 1 deletion tests/test_constants.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Pytest test suite for the constants module."""

from dataclasses import FrozenInstanceError
from pathlib import Path

import pytest
from hypothesis import given, strategies
Expand Down Expand Up @@ -44,7 +45,7 @@ def test_fuzz_init(directory, configfile, checksfile, extra, yes, no): # noqa:
def test_fuzz_immutable(fs, hr):
"""Use Hypothesis to confirm that attribute's value cannot be re-assigned."""
with pytest.raises(FrozenInstanceError):
fs.Current_Directory = "/new/path"
fs.Current_Directory = str(Path("/new") / Path("path"))
with pytest.raises(FrozenInstanceError):
hr.Yes = "YES"
with pytest.raises(FrozenInstanceError):
Expand Down
9 changes: 5 additions & 4 deletions tests/test_filesystem.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Pytest test suite for the filesystem module."""

import pathlib
from pathlib import Path
from unittest.mock import patch

import pytest
Expand All @@ -12,31 +13,31 @@

def test_valid_directory() -> None:
"""Confirm that a valid directory is found."""
directory_str = "./tests/"
directory_str = str(Path("./tests/"))
directory = pathlib.Path(directory_str)
confirmation = filesystem.confirm_valid_directory(directory)
assert confirmation is True


def test_invalid_directory() -> None:
"""Confirm that a valid directory is found."""
directory_str = "./testsNOT/"
directory_str = str(Path("./testsNOT/"))
directory = pathlib.Path(directory_str)
confirmation = filesystem.confirm_valid_directory(directory)
assert confirmation is False


def test_valid_file() -> None:
"""Confirm that a valid directory is found."""
file_str = "./tests/test_filesystem.py"
file_str = str(Path("./tests") / Path("test_filesystem.py"))
this_file = pathlib.Path(file_str)
confirmation = filesystem.confirm_valid_file(this_file)
assert confirmation is True


def test_invalid_file() -> None:
"""Confirm that a valid directory is found."""
file_str = "./tests/test_filesystemNOT.py"
file_str = str(Path("./tests") / Path("test_filesystemNOT.py.py"))
this_file_not = pathlib.Path(file_str)
confirmation = filesystem.confirm_valid_file(this_file_not)
assert confirmation is False
Expand Down
10 changes: 5 additions & 5 deletions tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
pattern: './/ClassDef'
count:
min: 1
max: 10
max: null
- name: "all-function-definition"
code: "AFD"
id: "F001"
Expand Down Expand Up @@ -91,7 +91,7 @@ def test_cli_analyze_correct_arguments_nothing_to_analyze_not_looking(tmpdir):
project_name = "testing"
# create a reference to the internal
# .chasten directory that supports testing
configuration_directory = test_one + "/.chasten"
configuration_directory = test_one / Path(".chasten")
configuration_directory_path = Path(configuration_directory)
configuration_directory_path.mkdir()
configuration_file = configuration_directory_path / "config.yml"
Expand Down Expand Up @@ -122,7 +122,7 @@ def test_cli_analyze_correct_arguments_analyze_chasten_codebase(cwd):
project_name = "testing"
# create a reference to the internal
# .chasten directory that supports testing
configuration_directory = str(cwd) + "/.chasten"
configuration_directory = cwd / Path(".chasten")
result = runner.invoke(
main.cli,
[
Expand All @@ -144,7 +144,7 @@ def test_cli_analyze_incorrect_arguments_no_project(cwd, tmpdir):
test_one = tmpdir.mkdir("test_one")
# create a reference to the internal
# .chasten directory that supports testing
configuration_directory = str(cwd) + "/.chasten"
configuration_directory = cwd / Path(".chasten")
# call the analyze command
result = runner.invoke(
main.cli,
Expand Down Expand Up @@ -297,7 +297,7 @@ def test_fuzz_cli_analyze_single_directory(cwd, directory):
project_name = "testing"
# create a reference to the internal
# .chasten directory that supports testing
configuration_directory = str(cwd) + "/.chasten"
configuration_directory = cwd / Path(".chasten")
result = runner.invoke(
main.cli,
[
Expand Down

0 comments on commit f5e46c5

Please sign in to comment.