diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 55f4505c..42000466 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.8.12, 3.9.12, 3.10.12, 3.11.9] + python-version: [3.8.12, 3.9.12, 3.10.12, 3.11.9, 3.12.4] steps: - uses: actions/checkout@v2 diff --git a/tests/unit/test_check.py b/tests/unit/test_check.py index 79cca746..dc494d51 100644 --- a/tests/unit/test_check.py +++ b/tests/unit/test_check.py @@ -3,10 +3,9 @@ import os import yaml from jnpr.jsnapy.check import Comparator -from mock import patch, MagicMock -from nose.plugins.attrib import attr +from unittest.mock import patch, MagicMock +import nose2 -@attr('unit') class TestCheck(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_comparison_op.py b/tests/unit/test_comparison_op.py index bf8f075b..a08244eb 100644 --- a/tests/unit/test_comparison_op.py +++ b/tests/unit/test_comparison_op.py @@ -1,11 +1,11 @@ import unittest import yaml from jnpr.jsnapy.check import Comparator -from mock import patch -from nose.plugins.attrib import attr +from unittest.mock import patch +import nose2 import os -@attr('unit') + class TestComparisonOperator(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_init.py b/tests/unit/test_init.py index a87b3cd5..00e3d9dc 100644 --- a/tests/unit/test_init.py +++ b/tests/unit/test_init.py @@ -2,10 +2,10 @@ import os import sys import yaml -from mock import patch, MagicMock -from nose.plugins.attrib import attr +from unittest.mock import patch, MagicMock +import nose2 from jnpr.jsnapy import get_config_location, get_path, DirStore, venv_check -@attr('unit') + class TestCheck(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_jsnapy.py b/tests/unit/test_jsnapy.py index 0d2b47fc..886fdf72 100644 --- a/tests/unit/test_jsnapy.py +++ b/tests/unit/test_jsnapy.py @@ -4,9 +4,9 @@ import sys from jnpr.jsnapy import version from jnpr.jsnapy.jsnapy import SnapAdmin -from mock import patch, MagicMock, call, ANY +from unittest.mock import patch, MagicMock, call, ANY # from contextlib import nested -from nose.plugins.attrib import attr +import nose2 import argparse from jnpr.junos.device import Device @@ -19,7 +19,7 @@ builtin_string = 'builtins.' -@attr('unit') + class TestSnapAdmin(unittest.TestCase): def setUp(self): self.diff = False diff --git a/tests/unit/test_notify.py b/tests/unit/test_notify.py index 816ec683..c2d9af3e 100644 --- a/tests/unit/test_notify.py +++ b/tests/unit/test_notify.py @@ -4,10 +4,10 @@ import os import yaml from jnpr.jsnapy.check import Comparator -from mock import patch, MagicMock -from nose.plugins.attrib import attr +from unittest.mock import patch, MagicMock +import nose2 + -@attr('unit') class TestCheck(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_numeric_op.py b/tests/unit/test_numeric_op.py index eed71c1b..71f47f29 100644 --- a/tests/unit/test_numeric_op.py +++ b/tests/unit/test_numeric_op.py @@ -1,11 +1,10 @@ import unittest import yaml from jnpr.jsnapy.check import Comparator -from mock import patch +from unittest.mock import patch import os -from nose.plugins.attrib import attr +import nose2 -@attr('unit') class TestNumericOperators(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_operator.py b/tests/unit/test_operator.py index 2cf8b045..5f47114a 100644 --- a/tests/unit/test_operator.py +++ b/tests/unit/test_operator.py @@ -3,11 +3,10 @@ import yaml from jnpr.jsnapy.check import Comparator from jnpr.jsnapy.operator import Operator -from mock import patch, MagicMock -from nose.plugins.attrib import attr +from unittest.mock import patch, MagicMock +import nose2 from lxml import etree -@attr('unit') class TestCheck(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_snap.py b/tests/unit/test_snap.py index d98cf9b8..f7fced9e 100644 --- a/tests/unit/test_snap.py +++ b/tests/unit/test_snap.py @@ -5,11 +5,10 @@ from jnpr.jsnapy import SnapAdmin import jnpr.junos.device from jnpr.junos.device import Device -from mock import patch, mock_open, ANY, call, MagicMock +from unittest.mock import patch, mock_open, ANY, call, MagicMock #from contextlib import nested -from nose.plugins.attrib import attr +import nose2 -@attr('unit') class TestSnap(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_snap_new.py b/tests/unit/test_snap_new.py index 5510124a..7899698c 100644 --- a/tests/unit/test_snap_new.py +++ b/tests/unit/test_snap_new.py @@ -5,10 +5,9 @@ from jnpr.junos.device import Device from jnpr.jsnapy import SnapAdmin import jnpr.junos.device -from mock import patch, mock_open, ANY, call, MagicMock -from nose.plugins.attrib import attr +from unittest.mock import patch, mock_open, ANY, call, MagicMock +import nose2 -@attr('unit') class TestSnap(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_sqlite.py b/tests/unit/test_sqlite.py index 38642720..32ec5a75 100644 --- a/tests/unit/test_sqlite.py +++ b/tests/unit/test_sqlite.py @@ -3,10 +3,9 @@ import sys from jnpr.jsnapy.sqlite_store import JsnapSqlite from jnpr.jsnapy.sqlite_get import SqliteExtractXml -from mock import patch -from nose.plugins.attrib import attr +from unittest.mock import patch +import nose2 -@attr('unit') class TestSqlite(unittest.TestCase): @classmethod diff --git a/tests/unit/test_str_numeric_op.py b/tests/unit/test_str_numeric_op.py index 068d8a02..d08f5a81 100644 --- a/tests/unit/test_str_numeric_op.py +++ b/tests/unit/test_str_numeric_op.py @@ -1,10 +1,10 @@ import unittest import yaml from jnpr.jsnapy.check import Comparator -from mock import patch +from unittest.mock import patch import os -from nose.plugins.attrib import attr -@attr('unit') +import nose2 + class TestStrNumericOperators(unittest.TestCase): def setUp(self): diff --git a/tests/unit/test_string_op.py b/tests/unit/test_string_op.py index 27e58184..02353701 100644 --- a/tests/unit/test_string_op.py +++ b/tests/unit/test_string_op.py @@ -1,11 +1,10 @@ import unittest import yaml from jnpr.jsnapy.check import Comparator -from mock import patch +from unittest.mock import patch import os -from nose.plugins.attrib import attr +import nose2 -@attr('unit') class TestStringOperators(unittest.TestCase): def setUp(self):