From 7af2af52aec33d7309aa5f1c70a82749d524e7fb Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Mon, 10 Jul 2023 09:14:33 -0500 Subject: [PATCH] Lint using isort --- test/conftest.py | 9 ++++++++- test/test_alt.py | 1 + test/test_alt_copy.py | 1 + test/test_assert_private_dirs.py | 1 + test/test_clone.py | 1 + test/test_config.py | 1 + test/test_encryption.py | 1 + test/test_enter.py | 1 + test/test_git.py | 1 + test/test_list.py | 1 + test/test_perms.py | 1 + test/test_syntax.py | 11 +++++++++++ test/test_unit_copy_perms.py | 1 + test/test_unit_remove_stale_links.py | 1 + test/test_unit_template_j2.py | 1 + test/test_unit_x_program.py | 1 + test/test_upgrade.py | 1 + test/test_version.py | 1 + test/utils.py | 2 +- 19 files changed, 36 insertions(+), 2 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 5e366b4..af68477 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -7,7 +7,8 @@ import os import platform import pwd import shutil -from subprocess import Popen, PIPE +from subprocess import PIPE, Popen + import py import pytest @@ -34,6 +35,12 @@ def pylint_version(): return '2.17.0' +@pytest.fixture(scope='session') +def isort_version(): + """Version of isort supported""" + return '5.12.0' + + @pytest.fixture(scope='session') def flake8_version(): """Version of flake8 supported""" diff --git a/test/test_alt.py b/test/test_alt.py index ddaf374..e57caee 100644 --- a/test/test_alt.py +++ b/test/test_alt.py @@ -1,6 +1,7 @@ """Test alt""" import os import string + import py import pytest import utils diff --git a/test/test_alt_copy.py b/test/test_alt_copy.py index fa8e09c..eb19e3d 100644 --- a/test/test_alt_copy.py +++ b/test/test_alt_copy.py @@ -1,6 +1,7 @@ """Test yadm.alt-copy""" import os + import pytest diff --git a/test/test_assert_private_dirs.py b/test/test_assert_private_dirs.py index bfd55ac..440446b 100644 --- a/test/test_assert_private_dirs.py +++ b/test/test_assert_private_dirs.py @@ -2,6 +2,7 @@ import os import re + import pytest pytestmark = pytest.mark.usefixtures('ds1_copy') diff --git a/test/test_clone.py b/test/test_clone.py index d5da7d9..9268965 100644 --- a/test/test_clone.py +++ b/test/test_clone.py @@ -2,6 +2,7 @@ import os import re + import pytest BOOTSTRAP_CODE = 123 diff --git a/test/test_config.py b/test/test_config.py index 19b0d02..d6a5e33 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -1,6 +1,7 @@ """Test config""" import os + import pytest TEST_SECTION = 'test' diff --git a/test/test_encryption.py b/test/test_encryption.py index 829ca1b..78bbf3a 100644 --- a/test/test_encryption.py +++ b/test/test_encryption.py @@ -3,6 +3,7 @@ import os import shlex import time + import pytest KEY_FILE = 'test/test_key' diff --git a/test/test_enter.py b/test/test_enter.py index f5ea2d8..5148e23 100644 --- a/test/test_enter.py +++ b/test/test_enter.py @@ -1,6 +1,7 @@ """Test enter""" import os + import pytest diff --git a/test/test_git.py b/test/test_git.py index 76eccab..41b102c 100644 --- a/test/test_git.py +++ b/test/test_git.py @@ -1,6 +1,7 @@ """Test git""" import re + import pytest diff --git a/test/test_list.py b/test/test_list.py index dcfe500..d7d09a6 100644 --- a/test/test_list.py +++ b/test/test_list.py @@ -1,6 +1,7 @@ """Test list""" import os + import pytest diff --git a/test/test_perms.py b/test/test_perms.py index 4f052bd..a49d897 100644 --- a/test/test_perms.py +++ b/test/test_perms.py @@ -1,6 +1,7 @@ """Test perms""" import os + import pytest diff --git a/test/test_syntax.py b/test/test_syntax.py index 1a422b3..8fae79e 100644 --- a/test/test_syntax.py +++ b/test/test_syntax.py @@ -1,6 +1,7 @@ """Syntax checks""" import os + import pytest @@ -34,6 +35,16 @@ def test_pylint(pytestconfig, runner, pylint_version): assert run.success +def test_isort(pytestconfig, runner, isort_version): + """Passes isort""" + if not pytestconfig.getoption("--force-linters"): + run = runner(command=['isort', '--version'], report=False) + if isort_version not in run.out: + pytest.skip('Unsupported isort version') + run = runner(command=['isort', '-c', 'test']) + assert run.success + + def test_flake8(pytestconfig, runner, flake8_version): """Passes flake8""" if not pytestconfig.getoption("--force-linters"): diff --git a/test/test_unit_copy_perms.py b/test/test_unit_copy_perms.py index 3c79768..b043878 100644 --- a/test/test_unit_copy_perms.py +++ b/test/test_unit_copy_perms.py @@ -1,5 +1,6 @@ """Unit tests: copy_perms""" import os + import pytest OCTAL = '7654' diff --git a/test/test_unit_remove_stale_links.py b/test/test_unit_remove_stale_links.py index 0bd960b..4fcf1a1 100644 --- a/test/test_unit_remove_stale_links.py +++ b/test/test_unit_remove_stale_links.py @@ -1,5 +1,6 @@ """Unit tests: remove_stale_links""" import os + import pytest diff --git a/test/test_unit_template_j2.py b/test/test_unit_template_j2.py index 4042a2d..84afc2d 100644 --- a/test/test_unit_template_j2.py +++ b/test/test_unit_template_j2.py @@ -1,5 +1,6 @@ """Unit tests: template_j2cli & template_envtpl""" import os + import pytest FILE_MODE = 0o754 diff --git a/test/test_unit_x_program.py b/test/test_unit_x_program.py index 8302f3c..883c9af 100644 --- a/test/test_unit_x_program.py +++ b/test/test_unit_x_program.py @@ -1,6 +1,7 @@ """Unit tests: yadm.[git,gpg]-program""" import os + import pytest diff --git a/test/test_upgrade.py b/test/test_upgrade.py index 77b7e4a..1805882 100644 --- a/test/test_upgrade.py +++ b/test/test_upgrade.py @@ -1,6 +1,7 @@ """Test upgrade""" import os + import pytest diff --git a/test/test_version.py b/test/test_version.py index 5655e47..aee6f33 100644 --- a/test/test_version.py +++ b/test/test_version.py @@ -1,6 +1,7 @@ """Test version""" import re + import pytest diff --git a/test/utils.py b/test/utils.py index 6cbe066..f71a758 100644 --- a/test/utils.py +++ b/test/utils.py @@ -3,8 +3,8 @@ This module holds values/functions common to multiple tests. """ -import re import os +import re ALT_FILE1 = 'test_alt' ALT_FILE2 = 'test alt/test alt'