From a666ed656d3c1d125dad985e968d9fad72444ec0a790e1cb9537d5fdadf9f79a Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Mon, 12 Feb 2024 11:03:19 +0000 Subject: [PATCH] - Update to 2.7.0: - Support added for Python 3.10 and above version. - 2.6.8: - Introduced optional argument routing instance for fs.cp() API - Introduced optional argument member_id for installation of pkg on specific member id of EX-VC - Changed the VlanTable field name to vlan-name and BfdSessionTable field name to client-name #423 - Fixed the port details in StartShell to use the port from Device object instead of default Port 22 #573 - Fixed the sw.install to use Windows file path for package copy #1206 - Fixed the sw.install to install the vc_master after the other vc_members gets installed for EX-3400 where unlink is set by default #1247 - Removed Unused Dependency: Netaddr #1257 - Fixed "object": version_info(re_version) emits ValueError: invalid literal for int() with base 10: '17-EVO' for EVO version X50.17-EVO#1264 - Drop python-junos-eznc-remove-nose.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=28 --- python-311.patch | 17 +- python-junos-eznc-2.6.7.tar.gz | 3 - python-junos-eznc-2.7.0.tar.gz | 3 + python-junos-eznc-no-mock.patch | 596 ++++---- python-junos-eznc-remove-nose.patch | 1231 ----------------- ...os-eznc-remove-yamlordereddictloader.patch | 92 +- python-junos-eznc.changes | 24 + python-junos-eznc.spec | 18 +- 8 files changed, 387 insertions(+), 1597 deletions(-) delete mode 100644 python-junos-eznc-2.6.7.tar.gz create mode 100644 python-junos-eznc-2.7.0.tar.gz delete mode 100644 python-junos-eznc-remove-nose.patch diff --git a/python-311.patch b/python-311.patch index 185a112..96a5e89 100644 --- a/python-311.patch +++ b/python-311.patch @@ -1,8 +1,8 @@ -Index: py-junos-eznc-2.6.7/lib/jnpr/junos/device.py +Index: py-junos-eznc-2.7.0/lib/jnpr/junos/device.py =================================================================== ---- py-junos-eznc-2.6.7.orig/lib/jnpr/junos/device.py -+++ py-junos-eznc-2.6.7/lib/jnpr/junos/device.py -@@ -43,6 +43,11 @@ from jnpr.junos.exception import JSONLoa +--- py-junos-eznc-2.7.0.orig/lib/jnpr/junos/device.py ++++ py-junos-eznc-2.7.0/lib/jnpr/junos/device.py +@@ -43,6 +43,12 @@ from jnpr.junos.exception import JSONLoa from ncclient.operations.third_party.juniper.rpc import ExecuteRpc import inspect @@ -11,13 +11,14 @@ Index: py-junos-eznc-2.6.7/lib/jnpr/junos/device.py +if not hasattr(inspect, "getargspec"): + inspect.getargspec = inspect.getfullargspec + - if sys.version_info.major >= 3: ++ + if sys.version_info[0] >= 3: NCCLIENT_FILTER_XML = len(inspect.signature(ExecuteRpc.request).parameters) == 3 else: -Index: py-junos-eznc-2.6.7/lib/jnpr/junos/utils/scp.py +Index: py-junos-eznc-2.7.0/lib/jnpr/junos/utils/scp.py =================================================================== ---- py-junos-eznc-2.6.7.orig/lib/jnpr/junos/utils/scp.py -+++ py-junos-eznc-2.6.7/lib/jnpr/junos/utils/scp.py +--- py-junos-eznc-2.7.0.orig/lib/jnpr/junos/utils/scp.py ++++ py-junos-eznc-2.7.0/lib/jnpr/junos/utils/scp.py @@ -1,6 +1,11 @@ from __future__ import absolute_import import inspect diff --git a/python-junos-eznc-2.6.7.tar.gz b/python-junos-eznc-2.6.7.tar.gz deleted file mode 100644 index c249f8b..0000000 --- a/python-junos-eznc-2.6.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f072f77e352a7f8bdeb3cea68c3db90a6724e0b4ba8fcf0ed95b59e153f2a14 -size 584291 diff --git a/python-junos-eznc-2.7.0.tar.gz b/python-junos-eznc-2.7.0.tar.gz new file mode 100644 index 0000000..5ac8b6d --- /dev/null +++ b/python-junos-eznc-2.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcf5a1d26476591be92275acd7a92fc1cff340c0a9c70da55eebfd9d4c07be5c +size 589369 diff --git a/python-junos-eznc-no-mock.patch b/python-junos-eznc-no-mock.patch index 27f6143..e2ec2b7 100644 --- a/python-junos-eznc-no-mock.patch +++ b/python-junos-eznc-no-mock.patch @@ -1,7 +1,7 @@ -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cfgtable.py +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cfgtable.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_cfgtable.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_cfgtable.py +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cfgtable.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_cfgtable.py @@ -13,7 +13,7 @@ from jnpr.junos import Device from ncclient.manager import Manager, make_device_handler from ncclient.transport import SSHSession @@ -11,10 +11,10 @@ Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cfgtable.py from jnpr.junos.factory import loadyaml from jnpr.junos.factory.factory_loader import FactoryLoader -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cmdtable.py +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_cmdtable.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_cmdtable.py +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cmdtable.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py @@ -10,7 +10,7 @@ from jnpr.junos.exception import RpcErro from ncclient.manager import Manager, make_device_handler @@ -24,23 +24,23 @@ Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cmdtable.py import yamlloader from jnpr.junos.factory.factory_loader import FactoryLoader import yaml -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_factory_loader.py +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_factory_loader.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_factory_loader.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_factory_loader.py +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_factory_loader.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_factory_loader.py @@ -4,7 +4,7 @@ __credits__ = "Jeremy Schulman" import unittest - import pytest + import nose2 from jnpr.junos.factory import FactoryLoader -from mock import patch +from unittest.mock import patch - @pytest.mark.unit -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_optable.py + class TestFactoryLoader(unittest.TestCase): +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_optable.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_optable.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_optable.py +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_optable.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_optable.py @@ -19,7 +19,7 @@ from ncclient.operations.rpc import RPCR from lxml import etree @@ -49,11 +49,11 @@ Index: py-junos-eznc-2.6.7/tests/unit/factory/test_optable.py +from unittest.mock import patch - @pytest.mark.unit -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_table.py + class TestFactoryOpTable(unittest.TestCase): +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_table.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_table.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_table.py +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_table.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_table.py @@ -8,7 +8,7 @@ import os from jnpr.junos import Device from jnpr.junos.factory.table import Table @@ -63,322 +63,270 @@ Index: py-junos-eznc-2.6.7/tests/unit/factory/test_table.py from lxml import etree from jnpr.junos.op.phyport import PhyPortTable -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_to_json.py +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_to_json.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_to_json.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_to_json.py +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_to_json.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_to_json.py @@ -5,7 +5,7 @@ try: except ImportError: import unittest - import pytest + import nose2 -from mock import patch +from unittest.mock import patch import os import json -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_view.py +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_view.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_view.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_view.py +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_view.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_view.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest - import pytest + import nose2 -from mock import MagicMock, patch +from unittest.mock import MagicMock, patch from jnpr.junos import Device from jnpr.junos.factory.view import View from jnpr.junos.op.phyport import PhyPortStatsTable, PhyPortStatsView -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_current_re.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_current_re.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_current_re.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_current_re.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_current_re.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_current_re.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_domain.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_domain.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_domain.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_domain.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_domain.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_domain.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_ethernet_mac_table.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_ethernet_mac_table.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_ethernet_mac_table.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_ethernet_mac_table.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_ethernet_mac_table.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_ethernet_mac_table.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_file_list.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_file_list.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_file_list.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_file_list.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_file_list.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_file_list.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_cluster_status.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_cluster_status.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_chassis_cluster_status.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_cluster_status.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_chassis_cluster_status.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_cluster_status.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_inventory.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_inventory.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_chassis_inventory.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_inventory.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_chassis_inventory.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_inventory.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_route_engine_information.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_route_engine_information.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_route_engine_information.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_route_engine_information.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_route_engine_information.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_route_engine_information.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_software_information.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_software_information.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_software_information.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_software_information.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_software_information.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_software_information.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_virtual_chassis_information.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_virtual_chassis_information.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_virtual_chassis_information.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_virtual_chassis_information.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_virtual_chassis_information.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_virtual_chassis_information.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os import sys from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_ifd_style.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_ifd_style.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_ifd_style.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_ifd_style.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_ifd_style.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_ifd_style.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from lxml import etree -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_iri_mapping.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_iri_mapping.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_iri_mapping.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_iri_mapping.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_iri_mapping.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_iri_mapping.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_personality.py +Index: py-junos-eznc-2.7.0/tests/unit/facts/test_personality.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_personality.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_personality.py +--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_personality.py ++++ py-junos-eznc-2.7.0/tests/unit/facts/test_personality.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os from jnpr.junos.exception import RpcError -Index: py-junos-eznc-2.6.7/tests/unit/__init__.py +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_chassis.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/__init__.py -+++ py-junos-eznc-2.6.7/tests/unit/__init__.py -@@ -2,7 +2,7 @@ import unittest - import sys - - import pytest --from mock import patch -+from unittest.mock import patch - - __author__ = "Nitin Kumar" - __credits__ = "Jeremy Schulman" -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_chassis.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_chassis.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_chassis.py +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_chassis.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_chassis.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from lxml import etree import os -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_domain.py +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_domain.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_domain.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_domain.py +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_domain.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_domain.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from lxml import etree from jnpr.junos.ofacts.domain import facts_domain -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_ifd_style.py +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_ifd_style.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_ifd_style.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_ifd_style.py +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_ifd_style.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_ifd_style.py @@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" __credits__ = "Jeremy Schulman" import unittest -from mock import patch +from unittest.mock import patch - import pytest + import nose2 from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_personality.py +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_personality.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_personality.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_personality.py +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_personality.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_personality.py @@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" __credits__ = "Jeremy Schulman" import unittest -from mock import patch +from unittest.mock import patch - import pytest + import nose2 from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_routing_engines.py +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_routing_engines.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_routing_engines.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_routing_engines.py +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_routing_engines.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_routing_engines.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest - import pytest + import nose2 -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock import os import sys -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_srx_cluster.py +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_srx_cluster.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_srx_cluster.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_srx_cluster.py +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_srx_cluster.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_srx_cluster.py @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest - import pytest + import nose2 -from mock import patch +from unittest.mock import patch import os from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_switch_style.py +Index: py-junos-eznc-2.7.0/tests/unit/test_decorators.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_switch_style.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_switch_style.py -@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from mock import patch -+from unittest.mock import patch - import pytest - - from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_swver.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_swver.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_swver.py -@@ -6,7 +6,7 @@ try: - except ImportError: - import unittest - import pytest --from mock import patch, MagicMock -+from unittest.mock import patch, MagicMock - import os - - from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/test_console.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_console.py -+++ py-junos-eznc-2.6.7/tests/unit/test_console.py -@@ -4,7 +4,7 @@ except ImportError: - import unittest - from jnpr.junos.utils.config import Config - import pytest --from mock import patch, MagicMock, call -+from unittest.mock import patch, MagicMock, call - import re - import sys - import os -Index: py-junos-eznc-2.6.7/tests/unit/test_decorators.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_decorators.py -+++ py-junos-eznc-2.6.7/tests/unit/test_decorators.py +--- py-junos-eznc-2.7.0.orig/tests/unit/test_decorators.py ++++ py-junos-eznc-2.7.0/tests/unit/test_decorators.py @@ -12,7 +12,7 @@ from jnpr.junos.exception import RpcErro from jnpr.junos.decorators import timeoutDecorator, normalizeDecorator from jnpr.junos.decorators import ignoreWarnDecorator @@ -388,62 +336,10 @@ Index: py-junos-eznc-2.6.7/tests/unit/test_decorators.py from ncclient.operations.rpc import RPCError from ncclient.manager import Manager, make_device_handler -Index: py-junos-eznc-2.6.7/tests/unit/test_device.py +Index: py-junos-eznc-2.7.0/tests/unit/test_rpcmeta.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_device.py -+++ py-junos-eznc-2.6.7/tests/unit/test_device.py -@@ -3,7 +3,7 @@ try: - except ImportError: - import unittest - import pytest --from mock import MagicMock, patch, mock_open, call -+from unittest.mock import MagicMock, patch, mock_open, call - import os - from lxml import etree - import sys -Index: py-junos-eznc-2.6.7/tests/unit/test_factcache.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_factcache.py -+++ py-junos-eznc-2.6.7/tests/unit/test_factcache.py -@@ -3,7 +3,7 @@ try: - except ImportError: - import unittest - import pytest --from mock import patch, MagicMock, call -+from unittest.mock import patch, MagicMock, call - from jnpr.junos.exception import FactLoopError - - from jnpr.junos import Device -Index: py-junos-eznc-2.6.7/tests/unit/test_junos.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_junos.py -+++ py-junos-eznc-2.6.7/tests/unit/test_junos.py -@@ -4,7 +4,7 @@ import unittest - import sys - - import pytest --from mock import patch -+from unittest.mock import patch - - __author__ = "Nitin Kumar" - __credits__ = "Jeremy Schulman" -Index: py-junos-eznc-2.6.7/tests/unit/test_jxml.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_jxml.py -+++ py-junos-eznc-2.6.7/tests/unit/test_jxml.py -@@ -2,7 +2,7 @@ import os - import unittest - from io import StringIO - import pytest --from mock import patch -+from unittest.mock import patch - from jnpr.junos.jxml import ( - NAME, - INSERT, -Index: py-junos-eznc-2.6.7/tests/unit/test_rpcmeta.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_rpcmeta.py -+++ py-junos-eznc-2.6.7/tests/unit/test_rpcmeta.py +--- py-junos-eznc-2.7.0.orig/tests/unit/test_rpcmeta.py ++++ py-junos-eznc-2.7.0/tests/unit/test_rpcmeta.py @@ -10,7 +10,7 @@ from ncclient.manager import Manager, ma from ncclient.transport import SSHSession from jnpr.junos.exception import JSONLoadError @@ -453,75 +349,10 @@ Index: py-junos-eznc-2.6.7/tests/unit/test_rpcmeta.py from lxml import etree __author__ = "Nitin Kumar, Rick Sherman" -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_serial.py +Index: py-junos-eznc-2.7.0/tests/unit/utils/test_config.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_serial.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_serial.py -@@ -3,7 +3,7 @@ try: - except ImportError: - import unittest - import pytest --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - import sys - import six - -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_netconf.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty_netconf.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty_netconf.py -@@ -3,7 +3,7 @@ try: - except ImportError: - import unittest - import pytest --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - from jnpr.junos.transport.tty_netconf import tty_netconf - import six - import os -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty.py -@@ -6,7 +6,7 @@ except ImportError: - import unittest - - import pytest --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - - from jnpr.junos.transport.tty import Terminal - from jnpr.junos import exception as EzErrors -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_ssh.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty_ssh.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty_ssh.py -@@ -6,7 +6,7 @@ try: - except ImportError: - import unittest - import pytest --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - from jnpr.junos.transport.tty_ssh import SSH - - -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_telnet.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty_telnet.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty_telnet.py -@@ -5,7 +5,7 @@ try: - except ImportError: - import unittest - import pytest --from mock import MagicMock, patch -+from unittest.mock import MagicMock, patch - from jnpr.junos.transport.tty_telnet import Telnet - import six - -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_config.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_config.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_config.py +--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_config.py ++++ py-junos-eznc-2.7.0/tests/unit/utils/test_config.py @@ -19,7 +19,7 @@ from ncclient.manager import Manager, ma from ncclient.transport import SSHSession from ncclient.operations import RPCError, RPCReply @@ -531,10 +362,10 @@ Index: py-junos-eznc-2.6.7/tests/unit/utils/test_config.py from lxml import etree import os -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_fs.py +Index: py-junos-eznc-2.7.0/tests/unit/utils/test_fs.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_fs.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_fs.py +--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_fs.py ++++ py-junos-eznc-2.7.0/tests/unit/utils/test_fs.py @@ -9,7 +9,7 @@ from jnpr.junos import Device from jnpr.junos.utils.fs import FS from jnpr.junos.exception import RpcError @@ -544,10 +375,10 @@ Index: py-junos-eznc-2.6.7/tests/unit/utils/test_fs.py from lxml import etree __author__ = "Nitin Kumar, Rick Sherman" -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_ftp.py +Index: py-junos-eznc-2.7.0/tests/unit/utils/test_ftp.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_ftp.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_ftp.py +--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_ftp.py ++++ py-junos-eznc-2.7.0/tests/unit/utils/test_ftp.py @@ -7,7 +7,7 @@ import os from jnpr.junos import Device import jnpr.junos.utils.ftp @@ -557,11 +388,11 @@ Index: py-junos-eznc-2.6.7/tests/unit/utils/test_ftp.py if sys.version < "3": builtin_string = "__builtin__" -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_scp.py +Index: py-junos-eznc-2.7.0/tests/unit/utils/test_scp.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_scp.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_scp.py -@@ -8,7 +8,7 @@ import pytest +--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_scp.py ++++ py-junos-eznc-2.7.0/tests/unit/utils/test_scp.py +@@ -8,7 +8,7 @@ import nose2 from jnpr.junos import Device from jnpr.junos.utils.scp import SCP @@ -570,11 +401,11 @@ Index: py-junos-eznc-2.6.7/tests/unit/utils/test_scp.py __author__ = "Rick Sherman, Nitin Kumar" __credits__ = "Jeremy Schulman" -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_start_shell.py +Index: py-junos-eznc-2.7.0/tests/unit/utils/test_start_shell.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_start_shell.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_start_shell.py -@@ -4,7 +4,7 @@ import pytest +--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_start_shell.py ++++ py-junos-eznc-2.7.0/tests/unit/utils/test_start_shell.py +@@ -4,7 +4,7 @@ import nose2 from jnpr.junos import Device from jnpr.junos.utils.start_shell import StartShell @@ -583,10 +414,10 @@ Index: py-junos-eznc-2.6.7/tests/unit/utils/test_start_shell.py __author__ = "Rick Sherman" __credits__ = "Jeremy Schulman, Nitin Kumar" -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_sw.py +Index: py-junos-eznc-2.7.0/tests/unit/utils/test_sw.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_sw.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_sw.py +--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_sw.py ++++ py-junos-eznc-2.7.0/tests/unit/utils/test_sw.py @@ -16,7 +16,7 @@ from jnpr.junos.facts.swver import versi from ncclient.manager import Manager, make_device_handler from ncclient.transport import SSHSession @@ -596,11 +427,11 @@ Index: py-junos-eznc-2.6.7/tests/unit/utils/test_sw.py if sys.version < "3": builtin_string = "__builtin__" -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_util.py +Index: py-junos-eznc-2.7.0/tests/unit/utils/test_util.py =================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_util.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_util.py -@@ -7,7 +7,7 @@ import pytest +--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_util.py ++++ py-junos-eznc-2.7.0/tests/unit/utils/test_util.py +@@ -7,7 +7,7 @@ import nose2 from jnpr.junos import Device from jnpr.junos.utils.util import Util @@ -608,4 +439,173 @@ Index: py-junos-eznc-2.6.7/tests/unit/utils/test_util.py +from unittest.mock import patch - @pytest.mark.unit + class TestUtil(unittest.TestCase): +Index: py-junos-eznc-2.7.0/tests/unit/__init__.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/__init__.py ++++ py-junos-eznc-2.7.0/tests/unit/__init__.py +@@ -2,7 +2,7 @@ import unittest + import sys + + import nose2 +-from mock import patch ++from unittest.mock import patch + + __author__ = "Nitin Kumar" + __credits__ = "Jeremy Schulman" +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_switch_style.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_switch_style.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_switch_style.py +@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" + __credits__ = "Jeremy Schulman" + + import unittest +-from mock import patch ++from unittest.mock import patch + import nose2 + + from jnpr.junos import Device +Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_swver.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_swver.py ++++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_swver.py +@@ -6,7 +6,7 @@ try: + except ImportError: + import unittest + import nose2 +-from mock import patch, MagicMock ++from unittest.mock import patch, MagicMock + import os + + from jnpr.junos import Device +Index: py-junos-eznc-2.7.0/tests/unit/test_console.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/test_console.py ++++ py-junos-eznc-2.7.0/tests/unit/test_console.py +@@ -4,7 +4,7 @@ except ImportError: + import unittest + from jnpr.junos.utils.config import Config + import nose2 +-from mock import patch, MagicMock, call ++from unittest.mock import patch, MagicMock, call + import re + import sys + import os +Index: py-junos-eznc-2.7.0/tests/unit/test_device.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/test_device.py ++++ py-junos-eznc-2.7.0/tests/unit/test_device.py +@@ -3,7 +3,7 @@ try: + except ImportError: + import unittest + import nose2 +-from mock import MagicMock, patch, mock_open, call ++from unittest.mock import MagicMock, patch, mock_open, call + import os + from lxml import etree + import sys +Index: py-junos-eznc-2.7.0/tests/unit/test_factcache.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/test_factcache.py ++++ py-junos-eznc-2.7.0/tests/unit/test_factcache.py +@@ -3,7 +3,7 @@ try: + except ImportError: + import unittest + import nose2 +-from mock import patch, MagicMock, call ++from unittest.mock import patch, MagicMock, call + from jnpr.junos.exception import FactLoopError + + from jnpr.junos import Device +Index: py-junos-eznc-2.7.0/tests/unit/test_junos.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/test_junos.py ++++ py-junos-eznc-2.7.0/tests/unit/test_junos.py +@@ -4,7 +4,7 @@ import unittest + import sys + + import nose2 +-from mock import patch ++from unittest.mock import patch + + __author__ = "Nitin Kumar" + __credits__ = "Jeremy Schulman" +Index: py-junos-eznc-2.7.0/tests/unit/test_jxml.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/test_jxml.py ++++ py-junos-eznc-2.7.0/tests/unit/test_jxml.py +@@ -2,7 +2,7 @@ import os + import unittest + from io import StringIO + import nose2 +-from mock import patch ++from unittest.mock import patch + from jnpr.junos.jxml import ( + NAME, + INSERT, +Index: py-junos-eznc-2.7.0/tests/unit/transport/test_serial.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_serial.py ++++ py-junos-eznc-2.7.0/tests/unit/transport/test_serial.py +@@ -3,7 +3,7 @@ try: + except ImportError: + import unittest + import nose2 +-from mock import MagicMock, patch ++from unittest.mock import MagicMock, patch + import sys + import six + +Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty.py ++++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty.py +@@ -6,7 +6,7 @@ except ImportError: + import unittest + + import nose2 +-from mock import MagicMock, patch ++from unittest.mock import MagicMock, patch + + from jnpr.junos.transport.tty import Terminal + from jnpr.junos import exception as EzErrors +Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_netconf.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_netconf.py ++++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_netconf.py +@@ -3,7 +3,7 @@ try: + except ImportError: + import unittest + import nose2 +-from mock import MagicMock, patch ++from unittest.mock import MagicMock, patch + + from jnpr.junos.transport.tty_netconf import tty_netconf + +Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_ssh.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_ssh.py ++++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_ssh.py +@@ -6,7 +6,7 @@ try: + except ImportError: + import unittest + import nose2 +-from mock import MagicMock, patch ++from unittest.mock import MagicMock, patch + from jnpr.junos.transport.tty_ssh import SSH + + +Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_telnet.py +=================================================================== +--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_telnet.py ++++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_telnet.py +@@ -5,7 +5,7 @@ try: + except ImportError: + import unittest + import nose2 +-from mock import MagicMock, patch ++from unittest.mock import MagicMock, patch + from jnpr.junos.transport.tty_telnet import Telnet + import six + diff --git a/python-junos-eznc-remove-nose.patch b/python-junos-eznc-remove-nose.patch deleted file mode 100644 index 412503b..0000000 --- a/python-junos-eznc-remove-nose.patch +++ /dev/null @@ -1,1231 +0,0 @@ -Index: py-junos-eznc-2.6.7/tests/functional/test_core.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/functional/test_core.py -+++ py-junos-eznc-2.6.7/tests/functional/test_core.py -@@ -4,11 +4,11 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from jnpr.junos.exception import RpcTimeoutError - - --@attr("functional") -+@pytest.mark.functional - class TestCore(unittest.TestCase): - @classmethod - def setUpClass(self): -Index: py-junos-eznc-2.6.7/tests/functional/test_device_ssh.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/functional/test_device_ssh.py -+++ py-junos-eznc-2.6.7/tests/functional/test_device_ssh.py -@@ -1,12 +1,12 @@ - __author__ = "rsherman, vnitinv" - - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - - --@attr("functional") -+@pytest.mark.functional - class TestDeviceSsh(unittest.TestCase): - def tearDown(self): - self.dev.close() -Index: py-junos-eznc-2.6.7/tests/functional/test_outbound_ssh.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/functional/test_outbound_ssh.py -+++ py-junos-eznc-2.6.7/tests/functional/test_outbound_ssh.py -@@ -1,13 +1,13 @@ - __author__ = "mwiget" - - import unittest --from nose.plugins.attrib import attr -+import pytest - - import socket - from jnpr.junos import Device - - --@attr("functional") -+@pytest.mark.functional - class TestDeviceSsh(unittest.TestCase): - def tearDown(self): - self.dev.close() -Index: py-junos-eznc-2.6.7/tests/functional/test_table.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/functional/test_table.py -+++ py-junos-eznc-2.6.7/tests/functional/test_table.py -@@ -4,13 +4,13 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos.op.routes import RouteTable - import json - - --@attr("functional") -+@pytest.mark.functional - class TestTable(unittest.TestCase): - @classmethod - def setUpClass(self): -Index: py-junos-eznc-2.6.7/tests/unit/__init__.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/__init__.py -+++ py-junos-eznc-2.6.7/tests/unit/__init__.py -@@ -1,14 +1,14 @@ - import unittest - import sys - --from nose.plugins.attrib import attr -+import pytest - from mock import patch - - __author__ = "Nitin Kumar" - __credits__ = "Jeremy Schulman" - - --@attr("unit") -+@pytest.mark.unit - class TestJunosInit(unittest.TestCase): - def test_warning(self): - with patch.object(sys.modules["sys"], "version_info", (2, 6, 3)) as mock_sys: -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cfgtable.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_cfgtable.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_cfgtable.py -@@ -5,7 +5,7 @@ import unittest - import os - import sys - --from nose.plugins.attrib import attr -+import pytest - import yaml - - from jnpr.junos import Device -@@ -85,7 +85,7 @@ yaml_bgp_data = """--- - globals().update(FactoryLoader().load(yaml.load(yaml_bgp_data, Loader=yaml.FullLoader))) - - --@attr("unit") -+@pytest.mark.unit - @unittest.skipIf(sys.platform == "win32", "will work for windows in coming days") - class TestFactoryCfgTable(unittest.TestCase): - @patch("ncclient.manager.connect") -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cmdtable.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_cmdtable.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_cmdtable.py -@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" - - import unittest - import os --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.exception import RpcError -@@ -17,7 +17,7 @@ import yaml - import json - - --@attr("unit") -+@pytest.mark.unit - class TestFactoryCMDTable(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_factory_cls.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_factory_cls.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_factory_cls.py -@@ -2,13 +2,13 @@ __author__ = "Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos.factory.factory_cls import FactoryCfgTable, FactoryOpTable - from jnpr.junos.factory.factory_cls import FactoryTable, FactoryView - - --@attr("unit") -+@pytest.mark.unit - class TestFactoryCls(unittest.TestCase): - def test_factory_cls_cfgtable(self): - t = FactoryCfgTable() -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_factory_loader.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_factory_loader.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_factory_loader.py -@@ -2,12 +2,12 @@ __author__ = "Rick Sherman, Nitin Kumar" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from jnpr.junos.factory import FactoryLoader - from mock import patch - - --@attr("unit") -+@pytest.mark.unit - class TestFactoryLoader(unittest.TestCase): - def setUp(self): - self.fl = FactoryLoader() -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_optable.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_optable.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_optable.py -@@ -5,7 +5,7 @@ import unittest - import os - import yaml - import json --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.op.phyport import PhyPortStatsTable -@@ -22,7 +22,7 @@ from lxml import etree - from mock import patch - - --@attr("unit") -+@pytest.mark.unit - class TestFactoryOpTable(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_table.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_table.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_table.py -@@ -2,7 +2,7 @@ __author__ = "Rick Sherman, Nitin Kumar" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - import os - - from jnpr.junos import Device -@@ -23,7 +23,7 @@ else: - builtin_string = "builtins" - - --@attr("unit") -+@pytest.mark.unit - class TestFactoryTable(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_to_json.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_to_json.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_to_json.py -@@ -4,7 +4,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch - import os - import json -@@ -21,7 +21,7 @@ from ncclient.transport import SSHSessio - from ncclient.operations.rpc import RPCReply - - --@attr("unit") -+@pytest.mark.unit - class TestToJson(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_view.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_view.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_view.py -@@ -2,7 +2,7 @@ __author__ = "Rick Sherman, Nitin Kumar" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import MagicMock, patch - from jnpr.junos import Device - from jnpr.junos.factory.view import View -@@ -10,7 +10,7 @@ from jnpr.junos.op.phyport import PhyPor - from lxml import etree - - --@attr("unit") -+@pytest.mark.unit - class TestFactoryView(unittest.TestCase): - def setUp(self): - self.dev = Device( -Index: py-junos-eznc-2.6.7/tests/unit/factory/test_view_fields.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/factory/test_view_fields.py -+++ py-junos-eznc-2.6.7/tests/unit/factory/test_view_fields.py -@@ -2,12 +2,12 @@ __author__ = "Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos.factory.viewfields import ViewFields - - --@attr("unit") -+@pytest.mark.unit - class TestFactoryViewFields(unittest.TestCase): - def setUp(self): - self.vf = ViewFields() -Index: py-junos-eznc-2.6.7/tests/unit/facts/test__init__.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test__init__.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test__init__.py -@@ -5,14 +5,14 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - import importlib - import sys - - import jnpr.junos.facts - - --@attr("unit") -+@pytest.mark.unit - class TestFactInitialization(unittest.TestCase): - def test_duplicate_facts(self): - module = importlib.import_module("tests.unit.facts.dupe_foo1") -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_current_re.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_current_re.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_current_re.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from lxml import etree -@@ -14,7 +14,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestCurrentRe(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_domain.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_domain.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_domain.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from lxml import etree -@@ -14,7 +14,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestDomain(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_ethernet_mac_table.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_ethernet_mac_table.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_ethernet_mac_table.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from lxml import etree -@@ -14,7 +14,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestEthernetMacTable(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_file_list.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_file_list.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_file_list.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - -@@ -12,7 +12,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestFileList(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_cluster_status.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_chassis_cluster_status.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_cluster_status.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from lxml import etree -@@ -14,7 +14,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestGetChassisClusterStatus(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_inventory.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_chassis_inventory.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_inventory.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - -@@ -12,7 +12,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestChassis(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_route_engine_information.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_route_engine_information.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_route_engine_information.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from lxml import etree -@@ -13,7 +13,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestGetRouteEngineInformation(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_software_information.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_software_information.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_software_information.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from lxml import etree -@@ -14,7 +14,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestGetSoftwareInformation(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_virtual_chassis_information.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_get_virtual_chassis_information.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_get_virtual_chassis_information.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - import sys -@@ -15,7 +15,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestGetVirtualChassisInformation(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_ifd_style.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_ifd_style.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_ifd_style.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from lxml import etree -@@ -14,7 +14,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestIfdStyle(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_iri_mapping.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_iri_mapping.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_iri_mapping.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - -@@ -12,7 +12,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestIriMapping(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_personality.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_personality.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_personality.py -@@ -2,7 +2,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - from jnpr.junos.exception import RpcError -@@ -13,7 +13,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestPersonality(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/facts/test_swver.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/facts/test_swver.py -+++ py-junos-eznc-2.6.7/tests/unit/facts/test_swver.py -@@ -7,12 +7,12 @@ try: - import unittest2 as unittest - except: - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos.facts.swver import version_info, get_facts - - --@attr("unit") -+@pytest.mark.unit - class TestVersionInfo(unittest.TestCase): - if six.PY2: - assertCountEqual = unittest.TestCase.assertItemsEqual -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_chassis.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_chassis.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_chassis.py -@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - from lxml import etree - import os -@@ -16,7 +16,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestChassis(unittest.TestCase): - @patch("ncclient.manager.connect") - @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_domain.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_domain.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_domain.py -@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - from lxml import etree - -@@ -11,7 +11,7 @@ from jnpr.junos import Device - from jnpr.junos.exception import RpcError - - --@attr("unit") -+@pytest.mark.unit - class TestDomain(unittest.TestCase): - @patch("ncclient.manager.connect") - @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_ifd_style.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_ifd_style.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_ifd_style.py -@@ -3,13 +3,13 @@ __credits__ = "Jeremy Schulman" - - import unittest - from mock import patch --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.ofacts.ifd_style import facts_ifd_style as ifd_style - - --@attr("unit") -+@pytest.mark.unit - class TestIFDStyle(unittest.TestCase): - @patch("jnpr.junos.device.warnings") - def setUp(self, mock_warnings): -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_personality.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_personality.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_personality.py -@@ -3,13 +3,13 @@ __credits__ = "Jeremy Schulman" - - import unittest - from mock import patch --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.ofacts.personality import facts_personality as personality - - --@attr("unit") -+@pytest.mark.unit - class TestPersonality(unittest.TestCase): - @patch("jnpr.junos.device.warnings") - def setUp(self, mock_warnings): -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_routing_engines.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_routing_engines.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_routing_engines.py -@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - import sys -@@ -14,7 +14,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestRoutingEngines(unittest.TestCase): - @patch("ncclient.manager.connect") - @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_srx_cluster.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_srx_cluster.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_srx_cluster.py -@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch - import os - -@@ -13,7 +13,7 @@ from ncclient.manager import Manager, ma - from ncclient.transport import SSHSession - - --@attr("unit") -+@pytest.mark.unit - class TestSrxCluster(unittest.TestCase): - @patch("ncclient.manager.connect") - @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_switch_style.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_switch_style.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_switch_style.py -@@ -3,13 +3,13 @@ __credits__ = "Jeremy Schulman" - - import unittest - from mock import patch --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.ofacts.switch_style import facts_switch_style as switch_style - - --@attr("unit") -+@pytest.mark.unit - class TestSwitchStyle(unittest.TestCase): - @patch("jnpr.junos.device.warnings") - def setUp(self, mock_warnings): -Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_swver.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/ofacts/test_swver.py -+++ py-junos-eznc-2.6.7/tests/unit/ofacts/test_swver.py -@@ -5,7 +5,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock - import os - -@@ -17,7 +17,7 @@ from ncclient.transport import SSHSessio - from jnpr.junos.exception import RpcError - - --@attr("unit") -+@pytest.mark.unit - class TestSwver(unittest.TestCase): - @patch("ncclient.manager.connect") - @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.6.7/tests/unit/test_console.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_console.py -+++ py-junos-eznc-2.6.7/tests/unit/test_console.py -@@ -3,7 +3,7 @@ try: - except ImportError: - import unittest - from jnpr.junos.utils.config import Config --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock, call - import re - import sys -@@ -23,7 +23,7 @@ else: - builtin_string = "builtins" - - --@attr("unit") -+@pytest.mark.unit - class TestConsole(unittest.TestCase): - @patch("jnpr.junos.transport.tty_telnet.Telnet._tty_open") - @patch("jnpr.junos.transport.tty_telnet.telnetlib.Telnet.expect") -Index: py-junos-eznc-2.6.7/tests/unit/test_decorators.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_decorators.py -+++ py-junos-eznc-2.6.7/tests/unit/test_decorators.py -@@ -2,7 +2,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - - from lxml.etree import XML - -@@ -22,7 +22,7 @@ from ncclient.xml_ import qualify - __author__ = "Rick Sherman" - - --@attr("unit") -+@pytest.mark.unit - class Test_Decorators(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/test_device.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_device.py -+++ py-junos-eznc-2.6.7/tests/unit/test_device.py -@@ -2,7 +2,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import MagicMock, patch, mock_open, call - import os - from lxml import etree -@@ -53,7 +53,7 @@ facts = { - } - - --@attr("unit") -+@pytest.mark.unit - class Test_MyTemplateLoader(unittest.TestCase): - def setUp(self): - from jnpr.junos.device import _MyTemplateLoader -@@ -78,7 +78,7 @@ class Test_MyTemplateLoader(unittest.Tes - self.template_loader.get_source(None, None) - - --@attr("unit") -+@pytest.mark.unit - class TestDevice(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/test_exception.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_exception.py -+++ py-junos-eznc-2.6.7/tests/unit/test_exception.py -@@ -1,5 +1,5 @@ - import unittest --from nose.plugins.attrib import attr -+import pytest - from jnpr.junos.exception import ( - RpcError, - CommitError, -@@ -81,7 +81,7 @@ config_json = """{ - }""" - - --@attr("unit") -+@pytest.mark.unit - class Test_RpcError(unittest.TestCase): - def test_rpcerror_repr(self): - rsp = etree.XML(rpc_xml) -Index: py-junos-eznc-2.6.7/tests/unit/test_factcache.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_factcache.py -+++ py-junos-eznc-2.6.7/tests/unit/test_factcache.py -@@ -2,7 +2,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import patch, MagicMock, call - from jnpr.junos.exception import FactLoopError - -@@ -15,7 +15,7 @@ __author__ = "Stacy Smith" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - --@attr("unit") -+@pytest.mark.unit - class TestFactCache(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/test_junos.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_junos.py -+++ py-junos-eznc-2.6.7/tests/unit/test_junos.py -@@ -3,14 +3,14 @@ - import unittest - import sys - --from nose.plugins.attrib import attr -+import pytest - from mock import patch - - __author__ = "Nitin Kumar" - __credits__ = "Jeremy Schulman" - - --@attr("unit") -+@pytest.mark.unit - class TestJunosInit(unittest.TestCase): - def test_warning(self): - with patch.object(sys.modules["sys"], "version_info", (2, 6, 3)) as mock_sys: -Index: py-junos-eznc-2.6.7/tests/unit/test_jxml.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_jxml.py -+++ py-junos-eznc-2.6.7/tests/unit/test_jxml.py -@@ -1,7 +1,7 @@ - import os - import unittest - from io import StringIO --from nose.plugins.attrib import attr -+import pytest - from mock import patch - from jnpr.junos.jxml import ( - NAME, -@@ -17,7 +17,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - --@attr("unit") -+@pytest.mark.unit - class Test_JXML(unittest.TestCase): - def test_name(self): - op = NAME("test") -Index: py-junos-eznc-2.6.7/tests/unit/test_rpcmeta.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/test_rpcmeta.py -+++ py-junos-eznc-2.6.7/tests/unit/test_rpcmeta.py -@@ -1,7 +1,7 @@ - import unittest - import os - import re --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos.device import Device - from jnpr.junos.rpcmeta import _RpcMetaExec -@@ -17,7 +17,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - --@attr("unit") -+@pytest.mark.unit - class Test_RpcMetaExec(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_serial.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_serial.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_serial.py -@@ -2,7 +2,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import MagicMock, patch - import sys - import six -@@ -15,7 +15,7 @@ else: - builtin_string = "builtins" - - --@attr("unit") -+@pytest.mark.unit - class TestSerial(unittest.TestCase): - @patch("jnpr.junos.transport.tty_serial.serial.Serial.open") - @patch("jnpr.junos.transport.tty_serial.serial.Serial.write") -@@ -77,7 +77,7 @@ class TestSerial(unittest.TestCase): - self.assertEqual(self.dev._tty.read_prompt()[0], None) - - --@attr("unit") -+@pytest.mark.unit - class TestSerialWin(unittest.TestCase): - @patch("jnpr.junos.transport.tty_serial.serial.Serial.open") - @patch("jnpr.junos.transport.tty_serial.serial.Serial.read") -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty.py -@@ -5,14 +5,14 @@ try: - except ImportError: - import unittest - --from nose.plugins.attrib import attr -+import pytest - from mock import MagicMock, patch - - from jnpr.junos.transport.tty import Terminal - from jnpr.junos import exception as EzErrors - - --@attr("unit") -+@pytest.mark.unit - class TestTTY(unittest.TestCase): - def setUp(self): - logging.getLogger("jnpr.junos.tty") -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_netconf.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty_netconf.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty_netconf.py -@@ -2,7 +2,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import MagicMock, patch - from jnpr.junos.transport.tty_netconf import tty_netconf - import six -@@ -12,7 +12,7 @@ import socket - from ncclient.operations import RPCError - - --@attr("unit") -+@pytest.mark.unit - class TestTTYNetconf(unittest.TestCase): - def setUp(self): - self.tty_net = tty_netconf(MagicMock()) -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_ssh.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty_ssh.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty_ssh.py -@@ -5,12 +5,12 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import MagicMock, patch - from jnpr.junos.transport.tty_ssh import SSH - - --@attr("unit") -+@pytest.mark.unit - class TestTTYSSH(unittest.TestCase): - @patch("jnpr.junos.transport.tty_ssh.paramiko") - def setUp(self, mock_paramiko): -Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_telnet.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/transport/test_tty_telnet.py -+++ py-junos-eznc-2.6.7/tests/unit/transport/test_tty_telnet.py -@@ -4,13 +4,13 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from mock import MagicMock, patch - from jnpr.junos.transport.tty_telnet import Telnet - import six - - --@attr("unit") -+@pytest.mark.unit - class TestTTYTelnet(unittest.TestCase): - @patch("jnpr.junos.transport.tty_telnet.telnetlib.Telnet") - def setUp(self, mpock_telnet): -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_config.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_config.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_config.py -@@ -1,6 +1,6 @@ - import unittest - import sys --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.utils.config import Config -@@ -32,7 +32,7 @@ else: - builtin_string = "builtins" - - --@attr("unit") -+@pytest.mark.unit - class TestConfig(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_fs.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_fs.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_fs.py -@@ -1,5 +1,5 @@ - import unittest --from nose.plugins.attrib import attr -+import pytest - import os - - from ncclient.manager import Manager, make_device_handler -@@ -16,7 +16,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - --@attr("unit") -+@pytest.mark.unit - class TestFS(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_ftp.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_ftp.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_ftp.py -@@ -1,5 +1,5 @@ - import unittest --from nose.plugins.attrib import attr -+import pytest - import ftplib - import sys - import os -@@ -15,7 +15,7 @@ else: - builtin_string = "builtins" - - --@attr("unit") -+@pytest.mark.unit - @unittest.skipIf(sys.platform == "win32", "will work for windows in coming days") - class TestFtp(unittest.TestCase): - @patch("ftplib.FTP.connect") -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_scp.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_scp.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_scp.py -@@ -3,7 +3,7 @@ from six import StringIO - from contextlib import contextmanager - - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.utils.scp import SCP -@@ -19,7 +19,7 @@ else: - builtin_string = "builtins" - - --@attr("unit") -+@pytest.mark.unit - class TestScp(unittest.TestCase): - def setUp(self): - self.dev = Device(host="1.1.1.1") -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_start_shell.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_start_shell.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_start_shell.py -@@ -1,5 +1,5 @@ - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.utils.start_shell import StartShell -@@ -10,7 +10,7 @@ __author__ = "Rick Sherman" - __credits__ = "Jeremy Schulman, Nitin Kumar" - - --@attr("unit") -+@pytest.mark.unit - class TestStartShell(unittest.TestCase): - @patch("paramiko.SSHClient") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_sw.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_sw.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_sw.py -@@ -7,7 +7,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest --from nose.plugins.attrib import attr -+import pytest - from contextlib import contextmanager - from jnpr.junos import Device - from jnpr.junos.exception import RpcError, SwRollbackError, RpcTimeoutError -@@ -59,7 +59,7 @@ facts = { - } - - --@attr("unit") -+@pytest.mark.unit - class TestSW(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/tests/unit/utils/test_util.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/unit/utils/test_util.py -+++ py-junos-eznc-2.6.7/tests/unit/utils/test_util.py -@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" - __credits__ = "Jeremy Schulman" - - import unittest --from nose.plugins.attrib import attr -+import pytest - - from jnpr.junos import Device - from jnpr.junos.utils.util import Util -@@ -10,7 +10,7 @@ from jnpr.junos.utils.util import Util - from mock import patch - - --@attr("unit") -+@pytest.mark.unit - class TestUtil(unittest.TestCase): - @patch("ncclient.manager.connect") - def setUp(self, mock_connect): -Index: py-junos-eznc-2.6.7/pytest.ini -=================================================================== ---- /dev/null -+++ py-junos-eznc-2.6.7/pytest.ini -@@ -0,0 +1,4 @@ -+[pytest] -+markers = -+ unit -+ functional -Index: py-junos-eznc-2.6.7/tests/functional/test_shell.py -=================================================================== ---- py-junos-eznc-2.6.7.orig/tests/functional/test_shell.py -+++ py-junos-eznc-2.6.7/tests/functional/test_shell.py -@@ -5,11 +5,11 @@ try: - except ImportError: - import unittest - --from nose.plugins.attrib import attr -+import pytest - import yaml - - --@attr('functional') -+@pytest.mark.functional - class test(unittest.TestCase): - - @classmethod diff --git a/python-junos-eznc-remove-yamlordereddictloader.patch b/python-junos-eznc-remove-yamlordereddictloader.patch index 8724f59..b7daaaf 100644 --- a/python-junos-eznc-remove-yamlordereddictloader.patch +++ b/python-junos-eznc-remove-yamlordereddictloader.patch @@ -1,17 +1,17 @@ -Index: py-junos-eznc-2.5.3/lib/jnpr/junos/command/__init__.py +Index: py-junos-eznc-2.7.0/lib/jnpr/junos/command/__init__.py =================================================================== ---- py-junos-eznc-2.5.3.orig/lib/jnpr/junos/command/__init__.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/lib/jnpr/junos/command/__init__.py 2020-09-15 09:47:59.613429201 +0200 -@@ -5,7 +5,7 @@ import types - - from jnpr.junos.factory.factory_loader import FactoryLoader +--- py-junos-eznc-2.7.0.orig/lib/jnpr/junos/command/__init__.py ++++ py-junos-eznc-2.7.0/lib/jnpr/junos/command/__init__.py +@@ -4,7 +4,7 @@ from importlib.abc import Loader, MetaPa + from importlib.util import spec_from_loader + import yaml -import yamlordereddictloader +import yamlloader + from jnpr.junos.factory.factory_loader import FactoryLoader __all__ = [] - -@@ -30,7 +30,7 @@ class MetaPathLoader(object): +@@ -32,7 +32,7 @@ class MetaPathLoader(Loader): with open(os.path.join(os.path.dirname(__file__), mod + ".yml"), "r") as stream: try: modules = FactoryLoader().load( @@ -20,10 +20,10 @@ Index: py-junos-eznc-2.5.3/lib/jnpr/junos/command/__init__.py ) except yaml.YAMLError as exc: raise ImportError("%s is not loaded" % mod) -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py +Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_cmdtable.py 2020-09-15 09:47:59.509428602 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py 2020-09-15 09:50:10.066179959 +0200 +--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cmdtable.py ++++ py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py @@ -11,7 +11,7 @@ from jnpr.junos.exception import RpcErro from ncclient.manager import Manager, make_device_handler from ncclient.transport import SSHSession @@ -33,7 +33,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py from jnpr.junos.factory.factory_loader import FactoryLoader import yaml import json -@@ -50,7 +50,7 @@ CMErrorView: +@@ -49,7 +49,7 @@ CMErrorView: """ globals().update( FactoryLoader().load( @@ -42,7 +42,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CMErrorTable(self.dev) -@@ -85,7 +85,7 @@ sysctlView: +@@ -84,7 +84,7 @@ sysctlView: """ globals().update( FactoryLoader().load( @@ -51,7 +51,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = sysctlVeriexecTable(self.dev) -@@ -126,7 +126,7 @@ CMErrorView: +@@ -125,7 +125,7 @@ CMErrorView: """ globals().update( FactoryLoader().load( @@ -60,7 +60,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CMErrorTable(self.dev) -@@ -188,7 +188,7 @@ CMErrorView: +@@ -187,7 +187,7 @@ CMErrorView: """ globals().update( FactoryLoader().load( @@ -69,7 +69,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CMErrorTable(self.dev) -@@ -212,7 +212,7 @@ CMErrorView: +@@ -211,7 +211,7 @@ CMErrorView: """ globals().update( FactoryLoader().load( @@ -78,7 +78,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CMErrorTable(self.dev) -@@ -240,7 +240,7 @@ CMErrorView: +@@ -239,7 +239,7 @@ CMErrorView: """ globals().update( FactoryLoader().load( @@ -87,7 +87,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CMErrorTable(self.dev) -@@ -267,7 +267,7 @@ CMErrorView: +@@ -266,7 +266,7 @@ CMErrorView: """ globals().update( FactoryLoader().load( @@ -96,7 +96,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CMErrorTable(self.dev) -@@ -293,7 +293,7 @@ CMErrorView: +@@ -292,7 +292,7 @@ CMErrorView: """ globals().update( FactoryLoader().load( @@ -105,7 +105,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CMErrorTable(self.dev).get() -@@ -327,7 +327,7 @@ FPCLinkStatTable: +@@ -326,7 +326,7 @@ FPCLinkStatTable: """ globals().update( FactoryLoader().load( @@ -114,7 +114,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = FPCLinkStatTable(self.dev) -@@ -371,7 +371,7 @@ ShowLuchipView: +@@ -370,7 +370,7 @@ ShowLuchipView: """ globals().update( FactoryLoader().load( @@ -123,7 +123,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = ShowLuchipTable(self.dev) -@@ -474,7 +474,7 @@ FPCLinkStatTable: +@@ -473,7 +473,7 @@ FPCLinkStatTable: """ globals().update( FactoryLoader().load( @@ -132,7 +132,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = FPCLinkStatTable(self.dev) -@@ -518,7 +518,7 @@ XMChipStatsView: +@@ -517,7 +517,7 @@ XMChipStatsView: """ globals().update( FactoryLoader().load( @@ -141,7 +141,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = XMChipStatsTable(self.dev) -@@ -537,7 +537,7 @@ FPCLinkStatTable: +@@ -536,7 +536,7 @@ FPCLinkStatTable: """ globals().update( FactoryLoader().load( @@ -150,7 +150,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = FPCLinkStatTable(self.dev) -@@ -636,7 +636,7 @@ FPCTTPReceiveStatsView: +@@ -635,7 +635,7 @@ FPCTTPReceiveStatsView: """ globals().update( FactoryLoader().load( @@ -159,7 +159,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = FPCTTPStatsTable(self.dev) -@@ -710,7 +710,7 @@ MtipCgeStatisticsTable: +@@ -709,7 +709,7 @@ MtipCgeStatisticsTable: """ globals().update( FactoryLoader().load( @@ -168,7 +168,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = MtipCgeSummaryTable(self.dev) -@@ -804,7 +804,7 @@ _ICMPRateView: +@@ -803,7 +803,7 @@ _ICMPRateView: """ globals().update( FactoryLoader().load( @@ -177,7 +177,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = ICMPStatsTable(self.dev) -@@ -905,7 +905,7 @@ _ThrottleStatsTable: +@@ -904,7 +904,7 @@ _ThrottleStatsTable: """ globals().update( FactoryLoader().load( @@ -186,7 +186,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = IthrottleIDTable(self.dev).get(target="fpc2") -@@ -946,7 +946,7 @@ ShowPciErrorsView: +@@ -945,7 +945,7 @@ ShowPciErrorsView: """ globals().update( FactoryLoader().load( @@ -195,7 +195,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = ShowPciErrorsTable(self.dev).get() -@@ -988,7 +988,7 @@ FPCMemoryView: +@@ -987,7 +987,7 @@ FPCMemoryView: """ globals().update( FactoryLoader().load( @@ -204,7 +204,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = FPCMemory(self.dev).get() -@@ -1046,7 +1046,7 @@ PQ3PCI: +@@ -1045,7 +1045,7 @@ PQ3PCI: """ globals().update( FactoryLoader().load( @@ -213,7 +213,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = PQ3PCITable(self.dev) -@@ -1172,7 +1172,7 @@ _TopThreadTable: +@@ -1171,7 +1171,7 @@ _TopThreadTable: """ globals().update( FactoryLoader().load( @@ -222,7 +222,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = SchedulerTable(self.dev) -@@ -1209,7 +1209,7 @@ HostlbStatusSummaryView: +@@ -1208,7 +1208,7 @@ HostlbStatusSummaryView: """ globals().update( FactoryLoader().load( @@ -231,7 +231,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = HostlbStatusSummaryTable(self.dev) -@@ -1235,7 +1235,7 @@ HostlbStatusSummaryView: +@@ -1234,7 +1234,7 @@ HostlbStatusSummaryView: """ globals().update( FactoryLoader().load( @@ -240,7 +240,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = HostlbStatusSummaryTable( -@@ -1311,7 +1311,7 @@ _TransmitPerQueueView: +@@ -1310,7 +1310,7 @@ _TransmitPerQueueView: """ globals().update( FactoryLoader().load( @@ -249,7 +249,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = DevicesLocalTable(self.dev) -@@ -1382,7 +1382,7 @@ _ReceiveView: +@@ -1381,7 +1381,7 @@ _ReceiveView: """ globals().update( FactoryLoader().load( @@ -258,7 +258,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = DevicesLocalTable(self.dev) -@@ -1402,7 +1402,7 @@ EthernetSwitchStatisticsIterTable: +@@ -1401,7 +1401,7 @@ EthernetSwitchStatisticsIterTable: """ globals().update( FactoryLoader().load( @@ -267,7 +267,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = EthernetSwitchStatisticsIterTable(self.dev) -@@ -1532,7 +1532,7 @@ _EthSwitchStatsFpc5Table: +@@ -1531,7 +1531,7 @@ _EthSwitchStatsFpc5Table: """ globals().update( FactoryLoader().load( @@ -276,7 +276,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = EthernetSwitchStatistics(self.dev) -@@ -1689,7 +1689,7 @@ _ShowToePfePacketStatsStream_rx_errors: +@@ -1688,7 +1688,7 @@ _ShowToePfePacketStatsStream_rx_errors: """ globals().update( FactoryLoader().load( @@ -285,7 +285,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = ShowToePfePacketStatsTable(self.dev) -@@ -1757,7 +1757,7 @@ _ShowToePfePacketStatsStream_rx_errors: +@@ -1756,7 +1756,7 @@ _ShowToePfePacketStatsStream_rx_errors: """ globals().update( FactoryLoader().load( @@ -294,7 +294,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = ShowToePfePacketStatsTable(self.dev) -@@ -2094,7 +2094,7 @@ XMChipInterruptStatsView: +@@ -2093,7 +2093,7 @@ XMChipInterruptStatsView: """ globals().update( FactoryLoader().load( @@ -303,7 +303,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = XMChipInterruptStatsTable(self.dev) -@@ -2127,7 +2127,7 @@ XMChipInterruptStatsView: +@@ -2126,7 +2126,7 @@ XMChipInterruptStatsView: """ globals().update( FactoryLoader().load( @@ -312,7 +312,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = XMChipInterruptStatsTable(self.dev) -@@ -2161,7 +2161,7 @@ FPCThreadView: +@@ -2160,7 +2160,7 @@ FPCThreadView: """ globals().update( FactoryLoader().load( @@ -321,7 +321,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = FPCThreads(self.dev) -@@ -2328,7 +2328,7 @@ CChipLoStatsView: +@@ -2327,7 +2327,7 @@ CChipLoStatsView: """ globals().update( FactoryLoader().load( @@ -330,7 +330,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = CChipLoStatsTable(self.dev) -@@ -2356,7 +2356,7 @@ ARPview: +@@ -2355,7 +2355,7 @@ ARPview: """ globals().update( FactoryLoader().load( @@ -339,7 +339,7 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py ) ) stats = ARPtable(self.dev) -@@ -2387,7 +2387,7 @@ ARPview: +@@ -2386,7 +2386,7 @@ ARPview: """ globals().update( FactoryLoader().load( diff --git a/python-junos-eznc.changes b/python-junos-eznc.changes index c481643..a8c5e0e 100644 --- a/python-junos-eznc.changes +++ b/python-junos-eznc.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Feb 12 11:01:26 UTC 2024 - Daniel Garcia + +- Update to 2.7.0: + - Support added for Python 3.10 and above version. +- 2.6.8: + - Introduced optional argument routing instance for fs.cp() API + - Introduced optional argument member_id for installation of pkg on + specific member id of EX-VC + - Changed the VlanTable field name to vlan-name and BfdSessionTable + field name to client-name #423 + - Fixed the port details in StartShell to use the port from Device + object instead of default Port 22 #573 + - Fixed the sw.install to use Windows file path for package copy + #1206 + - Fixed the sw.install to install the vc_master after the other + vc_members gets installed for EX-3400 where unlink is set by + default #1247 + - Removed Unused Dependency: Netaddr #1257 + - Fixed "object": version_info(re_version) emits ValueError: invalid + literal for int() with base 10: '17-EVO' for EVO version + X50.17-EVO#1264 +- Drop python-junos-eznc-remove-nose.patch + ------------------------------------------------------------------- Thu Mar 2 07:14:57 UTC 2023 - Daniel Garcia diff --git a/python-junos-eznc.spec b/python-junos-eznc.spec index e854a71..0b61757 100644 --- a/python-junos-eznc.spec +++ b/python-junos-eznc.spec @@ -1,7 +1,7 @@ # # spec file for package python-junos-eznc # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2017-2020, Martin Hauke # # All modifications and additions to the file contributed by third parties @@ -19,15 +19,12 @@ %define skip_python2 1 Name: python-junos-eznc -Version: 2.6.7 +Version: 2.7.0 Release: 0 Summary: Junos 'EZ' automation for non-programmers License: Apache-2.0 URL: https://www.github.com/Juniper/py-junos-eznc Source: https://github.com/Juniper/py-junos-eznc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# replace deprecated nose by pytest -# https://github.com/Juniper/py-junos-eznc/pull/1078 -Patch0: python-junos-eznc-remove-nose.patch # replace deprecated yamlordereddictloader by yamlloader # https://github.com/Juniper/py-junos-eznc/pull/1078 Patch1: python-junos-eznc-remove-yamlordereddictloader.patch @@ -38,8 +35,8 @@ Patch4: python-311.patch BuildRequires: %{python_module Jinja2 >= 2.7.1} BuildRequires: %{python_module PyYAML >= 5.1} BuildRequires: %{python_module lxml >= 3.2.4} -BuildRequires: %{python_module ncclient >= 0.6.13} -BuildRequires: %{python_module netaddr} +BuildRequires: %{python_module ncclient >= 0.6.15} +BuildRequires: %{python_module nose2} BuildRequires: %{python_module ntc-templates} BuildRequires: %{python_module paramiko >= 1.15.2} BuildRequires: %{python_module pyparsing} @@ -56,9 +53,7 @@ BuildRequires: python-rpm-macros Requires: python-Jinja2 >= 2.7.1 Requires: python-PyYAML >= 5.1 Requires: python-lxml >= 3.2.4 -Requires: python-ncclient >= 0.6.13 -Requires: python-netaddr -Requires: python-ntc-templates +Requires: python-ncclient >= 0.6.15 Requires: python-paramiko >= 1.15.2 Requires: python-pyparsing Requires: python-pyserial @@ -96,7 +91,8 @@ donttest="nonemptydonttestprefix" # https://github.com/Juniper/py-junos-eznc/issues/1109 python39_donttest=" or test_sw_put_ftp" python310_donttest=" or test_sw_put_ftp" -%pytest -m "not functional" --forked -k "not ($donttest ${$python_donttest})" +donttest+=" or test_sw_install_multi_vc" +%pytest -m "not functional" --forked -k "not ($donttest ${$python_donttest})" tests/unit %files %{python_files} %license COPYRIGHT LICENSE