From 6a54ddccb76e217fd12b5ed01f9c738ba6b2f5949155698e5882f1753a647c01 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Thu, 2 Mar 2023 07:18:00 +0000 Subject: [PATCH] - Add python-311.patch to support python 3.11, gh#Juniper/py-junos-eznc#1236 - Remove python-junos-eznc-fix-unittests.patch, not needed anymore - Update to 2.6.7: * Supported option to set look_for_keys with bool True/False #1234 * Fixed build failure against setuptools #1231 - 2.6.6 * Fixed reboot failing on other RE #1199 * Fixed passing 'sleep' arg to StartShell run() #1202 * Fixed PyEZ get-facts support for ACX model #1209 * Fixed EthPortTable regex pattern #1215 * Fixed StartShell UnboundLocalError #1203 #1211 - 2.6.5 * Supported multi-gig ports for EthPortTable.yml #1177 * Fixed on-box support for start shell types #1190 #1186 * Fixed conn_open_timeout value was getting set None , changed it to default 30 seconds #1184 - 2.6.4 * Supported start_shell options to choose the shell types (sh or csh) #995 * Supported for python 3.9 * Fixed Device facts current_re returns the SRX cluster node0 and node1 details with cluster ID 16 #1135 * Fixed upgrade ncclient version 0.6.13, updated requirements.txt to install ncclient==0.6.13 #1153 * Fixed deprecation warning due to invalid escape sequences #1034 * Fixed Unit tests test_sw_put_ftp failure #1165 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=26 --- python-311.patch | 32 +++ python-junos-eznc-2.6.3.tar.gz | 3 - python-junos-eznc-2.6.7.tar.gz | 3 + python-junos-eznc-fix-unittests.patch | 70 ----- python-junos-eznc-no-mock.patch | 329 +++++++++++++---------- python-junos-eznc-remove-nose.patch | 360 ++++++++++++++------------ python-junos-eznc.changes | 29 +++ python-junos-eznc.spec | 13 +- 8 files changed, 447 insertions(+), 392 deletions(-) create mode 100644 python-311.patch delete mode 100644 python-junos-eznc-2.6.3.tar.gz create mode 100644 python-junos-eznc-2.6.7.tar.gz delete mode 100644 python-junos-eznc-fix-unittests.patch diff --git a/python-311.patch b/python-311.patch new file mode 100644 index 0000000..185a112 --- /dev/null +++ b/python-311.patch @@ -0,0 +1,32 @@ +Index: py-junos-eznc-2.6.7/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 + from ncclient.operations.third_party.juniper.rpc import ExecuteRpc + import inspect + ++# Python 3.11 compatibility ++# gh#Juniper/py-junos-eznc#1236 ++if not hasattr(inspect, "getargspec"): ++ inspect.getargspec = inspect.getfullargspec ++ + if sys.version_info.major >= 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 +=================================================================== +--- 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 +@@ -1,6 +1,11 @@ + from __future__ import absolute_import + import inspect + ++# Python 3.11 compatibility ++# gh#Juniper/py-junos-eznc#1236 ++if not hasattr(inspect, "getargspec"): ++ inspect.getargspec = inspect.getfullargspec ++ + from scp import SCPClient + from jnpr.junos.utils.ssh_client import open_ssh_client + diff --git a/python-junos-eznc-2.6.3.tar.gz b/python-junos-eznc-2.6.3.tar.gz deleted file mode 100644 index 333a6fd..0000000 --- a/python-junos-eznc-2.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c50e9e4a86126ff0e6a6b4810f421a24173fb54bfa3c31c49b099ae85cc01d49 -size 582708 diff --git a/python-junos-eznc-2.6.7.tar.gz b/python-junos-eznc-2.6.7.tar.gz new file mode 100644 index 0000000..c249f8b --- /dev/null +++ b/python-junos-eznc-2.6.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f072f77e352a7f8bdeb3cea68c3db90a6724e0b4ba8fcf0ed95b59e153f2a14 +size 584291 diff --git a/python-junos-eznc-fix-unittests.patch b/python-junos-eznc-fix-unittests.patch deleted file mode 100644 index 6d5bb69..0000000 --- a/python-junos-eznc-fix-unittests.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml -index daaf86ae2..b6f561ba9 100644 ---- a/.github/workflows/pylint.yml -+++ b/.github/workflows/pylint.yml -@@ -14,7 +14,7 @@ jobs: - strategy: - matrix: - os: [ubuntu-latest, windows-latest] -- python-version: [3.7, 3.8] -+ python-version: [3.7, 3.8, 3.9] - exclude: - - os: windows-latest - python-version: 3.8 -@@ -38,7 +38,7 @@ jobs: - - name: Run black tool - run: | - pip install -U black; -- black --check --exclude=docs/* . -+ black --check --diff --exclude="docs|build|tests|samples" . - - - name: Run unit tests - run: | -diff --git a/lib/jnpr/junos/factory/table.py b/lib/jnpr/junos/factory/table.py -index 724c3d988..72eb6d79b 100644 ---- a/lib/jnpr/junos/factory/table.py -+++ b/lib/jnpr/junos/factory/table.py -@@ -245,7 +245,9 @@ def savexml(self, path, hostname=False, timestamp=False, append=None): - fname += "_%s" % append - - path = fname + fext -- return etree.ElementTree(self.xml).write(open(path, "wb")) -+ with open(path, "wb+") as f: -+ pass -+ return etree.ElementTree(self.xml).write(path) - - def to_json(self): - """ -diff --git a/tests/unit/factory/test_table.py b/tests/unit/factory/test_table.py -index 25e8b1b18..870a723ed 100644 ---- a/tests/unit/factory/test_table.py -+++ b/tests/unit/factory/test_table.py -@@ -139,9 +139,9 @@ def test_table_get_RuntimeError(self): - def test_table_savexml(self, mock_file, mock_execute): - mock_execute.side_effect = self._mock_manager - self.ppt.xml = etree.XML("test") -- self.ppt.savexml("/vasr/tmssp/foo.xml", hostname=True, append="test") -- mock_file.assert_called_once_with("/vasr/tmssp/foo_1.1.1.1_test.xml", "wb") -- self.ppt.savexml("/vasr/tmssp/foo.xml", hostname=True, timestamp=True) -+ self.ppt.savexml("foo.xml", hostname=True, append="test") -+ mock_file.assert_called_once_with("foo_1.1.1.1_test.xml", "wb+") -+ self.ppt.savexml("foo.xml", hostname=True, timestamp=True) - self.assertEqual(mock_file.call_count, 2) - - def _read_file(self, fname): -diff --git a/tests/unit/utils/test_sw.py b/tests/unit/utils/test_sw.py -index f7c566249..c48d6f1a9 100644 ---- a/tests/unit/utils/test_sw.py -+++ b/tests/unit/utils/test_sw.py -@@ -161,7 +161,9 @@ def test_sw_put_ftp(self, mock_ftp_put): - dev.facts = facts - sw = SW(dev) - sw.put(package="test.tgz") -- self.assertTrue(call("test.tgz", "/var/tmp") in mock_ftp_put.mock_calls) -+ self.assertTrue( -+ any("('test.tgz', '/var/tmp')" in str(s) for s in mock_ftp_put.mock_calls) -+ ) - - @patch("jnpr.junos.utils.scp.SCP.__exit__") - @patch("jnpr.junos.utils.scp.SCP.__init__") - diff --git a/python-junos-eznc-no-mock.patch b/python-junos-eznc-no-mock.patch index 6679788..27f6143 100644 --- a/python-junos-eznc-no-mock.patch +++ b/python-junos-eznc-no-mock.patch @@ -1,6 +1,7 @@ -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_cfgtable.py py-junos-eznc-2.6.3/tests/unit/factory/test_cfgtable.py ---- py-junos-eznc-2.6.3.orig/tests/unit/factory/test_cfgtable.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/factory/test_cfgtable.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -13,7 +13,7 @@ from jnpr.junos import Device from ncclient.manager import Manager, make_device_handler from ncclient.transport import SSHSession @@ -10,9 +11,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_cfgtable.py py-junos- from jnpr.junos.factory import loadyaml from jnpr.junos.factory.factory_loader import FactoryLoader -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_cmdtable.py py-junos-eznc-2.6.3/tests/unit/factory/test_cmdtable.py ---- py-junos-eznc-2.6.3.orig/tests/unit/factory/test_cmdtable.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/factory/test_cmdtable.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -10,7 +10,7 @@ from jnpr.junos.exception import RpcErro from ncclient.manager import Manager, make_device_handler @@ -22,9 +24,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_cmdtable.py py-junos- import yamlloader from jnpr.junos.factory.factory_loader import FactoryLoader import yaml -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_factory_loader.py py-junos-eznc-2.6.3/tests/unit/factory/test_factory_loader.py ---- py-junos-eznc-2.6.3.orig/tests/unit/factory/test_factory_loader.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/factory/test_factory_loader.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -4,7 +4,7 @@ __credits__ = "Jeremy Schulman" import unittest import pytest @@ -34,9 +37,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_factory_loader.py py- @pytest.mark.unit -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_optable.py py-junos-eznc-2.6.3/tests/unit/factory/test_optable.py ---- py-junos-eznc-2.6.3.orig/tests/unit/factory/test_optable.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/factory/test_optable.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -19,7 +19,7 @@ from ncclient.operations.rpc import RPCR from lxml import etree @@ -46,9 +50,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_optable.py py-junos-e @pytest.mark.unit -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_table.py py-junos-eznc-2.6.3/tests/unit/factory/test_table.py ---- py-junos-eznc-2.6.3.orig/tests/unit/factory/test_table.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/factory/test_table.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -8,7 +8,7 @@ import os from jnpr.junos import Device from jnpr.junos.factory.table import Table @@ -58,9 +63,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_table.py py-junos-ezn from lxml import etree from jnpr.junos.op.phyport import PhyPortTable -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_to_json.py py-junos-eznc-2.6.3/tests/unit/factory/test_to_json.py ---- py-junos-eznc-2.6.3.orig/tests/unit/factory/test_to_json.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/factory/test_to_json.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -5,7 +5,7 @@ try: except ImportError: import unittest @@ -70,9 +76,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_to_json.py py-junos-e import os import json -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_view.py py-junos-eznc-2.6.3/tests/unit/factory/test_view.py ---- py-junos-eznc-2.6.3.orig/tests/unit/factory/test_view.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/factory/test_view.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest @@ -82,9 +89,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/factory/test_view.py py-junos-eznc from jnpr.junos import Device from jnpr.junos.factory.view import View from jnpr.junos.op.phyport import PhyPortStatsTable, PhyPortStatsView -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_current_re.py py-junos-eznc-2.6.3/tests/unit/facts/test_current_re.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_current_re.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_current_re.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -94,9 +102,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_current_re.py py-junos- import os from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_domain.py py-junos-eznc-2.6.3/tests/unit/facts/test_domain.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_domain.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_domain.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -106,9 +115,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_domain.py py-junos-eznc import os from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_ethernet_mac_table.py py-junos-eznc-2.6.3/tests/unit/facts/test_ethernet_mac_table.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_ethernet_mac_table.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_ethernet_mac_table.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -118,9 +128,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_ethernet_mac_table.py p import os from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_file_list.py py-junos-eznc-2.6.3/tests/unit/facts/test_file_list.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_file_list.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_file_list.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -130,9 +141,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_file_list.py py-junos-e import os from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_chassis_cluster_status.py py-junos-eznc-2.6.3/tests/unit/facts/test_get_chassis_cluster_status.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_chassis_cluster_status.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_get_chassis_cluster_status.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -142,9 +154,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_chassis_cluster_sta import os from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_chassis_inventory.py py-junos-eznc-2.6.3/tests/unit/facts/test_get_chassis_inventory.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_chassis_inventory.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_get_chassis_inventory.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -154,9 +167,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_chassis_inventory.p import os from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_route_engine_information.py py-junos-eznc-2.6.3/tests/unit/facts/test_get_route_engine_information.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_route_engine_information.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_get_route_engine_information.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -166,9 +180,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_route_engine_inform import os from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_software_information.py py-junos-eznc-2.6.3/tests/unit/facts/test_get_software_information.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_software_information.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_get_software_information.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -178,9 +193,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_software_informatio import os from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_virtual_chassis_information.py py-junos-eznc-2.6.3/tests/unit/facts/test_get_virtual_chassis_information.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_virtual_chassis_information.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_get_virtual_chassis_information.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -190,9 +206,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_get_virtual_chassis_inf import os import sys from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_ifd_style.py py-junos-eznc-2.6.3/tests/unit/facts/test_ifd_style.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_ifd_style.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_ifd_style.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -202,9 +219,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_ifd_style.py py-junos-e import os from lxml import etree -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_iri_mapping.py py-junos-eznc-2.6.3/tests/unit/facts/test_iri_mapping.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_iri_mapping.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_iri_mapping.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -214,9 +232,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_iri_mapping.py py-junos import os from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_personality.py py-junos-eznc-2.6.3/tests/unit/facts/test_personality.py ---- py-junos-eznc-2.6.3.orig/tests/unit/facts/test_personality.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/facts/test_personality.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku import unittest @@ -226,9 +245,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/facts/test_personality.py py-junos import os from jnpr.junos.exception import RpcError -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/__init__.py py-junos-eznc-2.6.3/tests/unit/__init__.py ---- py-junos-eznc-2.6.3.orig/tests/unit/__init__.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/__init__.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -2,7 +2,7 @@ import unittest import sys @@ -238,9 +258,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/__init__.py py-junos-eznc-2.6.3/te __author__ = "Nitin Kumar" __credits__ = "Jeremy Schulman" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_chassis.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_chassis.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_chassis.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_chassis.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest @@ -250,9 +271,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_chassis.py py-junos-ez from lxml import etree import os -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_domain.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_domain.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_domain.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_domain.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest @@ -262,9 +284,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_domain.py py-junos-ezn from lxml import etree from jnpr.junos.ofacts.domain import facts_domain -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_ifd_style.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_ifd_style.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_ifd_style.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_ifd_style.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" __credits__ = "Jeremy Schulman" @@ -274,9 +297,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_ifd_style.py py-junos- import pytest from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_personality.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_personality.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_personality.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_personality.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" __credits__ = "Jeremy Schulman" @@ -286,9 +310,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_personality.py py-juno import pytest from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_routing_engines.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_routing_engines.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_routing_engines.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_routing_engines.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest @@ -298,9 +323,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_routing_engines.py py- import os import sys -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_srx_cluster.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_srx_cluster.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_srx_cluster.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_srx_cluster.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman" import unittest @@ -310,9 +336,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_srx_cluster.py py-juno import os from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_switch_style.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_switch_style.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_switch_style.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_switch_style.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman" __credits__ = "Jeremy Schulman" @@ -322,9 +349,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_switch_style.py py-jun import pytest from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_swver.py py-junos-eznc-2.6.3/tests/unit/ofacts/test_swver.py ---- py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_swver.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/ofacts/test_swver.py 2022-05-03 13:49:10.491645348 +0200 +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 @@ -334,9 +362,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/ofacts/test_swver.py py-junos-eznc import os from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_console.py py-junos-eznc-2.6.3/tests/unit/test_console.py ---- py-junos-eznc-2.6.3.orig/tests/unit/test_console.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/test_console.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -346,9 +375,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_console.py py-junos-eznc-2.6. import re import sys import os -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_decorators.py py-junos-eznc-2.6.3/tests/unit/test_decorators.py ---- py-junos-eznc-2.6.3.orig/tests/unit/test_decorators.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/test_decorators.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -12,7 +12,7 @@ from jnpr.junos.exception import RpcErro from jnpr.junos.decorators import timeoutDecorator, normalizeDecorator from jnpr.junos.decorators import ignoreWarnDecorator @@ -358,9 +388,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_decorators.py py-junos-eznc-2 from ncclient.operations.rpc import RPCError from ncclient.manager import Manager, make_device_handler -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_device.py py-junos-eznc-2.6.3/tests/unit/test_device.py ---- py-junos-eznc-2.6.3.orig/tests/unit/test_device.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/test_device.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -3,7 +3,7 @@ try: except ImportError: import unittest @@ -370,9 +401,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_device.py py-junos-eznc-2.6.3 import os from lxml import etree import sys -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_factcache.py py-junos-eznc-2.6.3/tests/unit/test_factcache.py ---- py-junos-eznc-2.6.3.orig/tests/unit/test_factcache.py 2022-05-03 13:49:10.451645097 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/test_factcache.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -382,9 +414,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_factcache.py py-junos-eznc-2. from jnpr.junos.exception import FactLoopError from jnpr.junos import Device -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_junos.py py-junos-eznc-2.6.3/tests/unit/test_junos.py ---- py-junos-eznc-2.6.3.orig/tests/unit/test_junos.py 2022-05-03 13:49:10.451645097 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/test_junos.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -394,9 +427,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_junos.py py-junos-eznc-2.6.3/ __author__ = "Nitin Kumar" __credits__ = "Jeremy Schulman" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_jxml.py py-junos-eznc-2.6.3/tests/unit/test_jxml.py ---- py-junos-eznc-2.6.3.orig/tests/unit/test_jxml.py 2022-05-03 13:49:10.451645097 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/test_jxml.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -406,9 +440,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_jxml.py py-junos-eznc-2.6.3/t from jnpr.junos.jxml import ( NAME, INSERT, -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_rpcmeta.py py-junos-eznc-2.6.3/tests/unit/test_rpcmeta.py ---- py-junos-eznc-2.6.3.orig/tests/unit/test_rpcmeta.py 2022-05-03 13:49:10.451645097 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/test_rpcmeta.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -10,7 +10,7 @@ from ncclient.manager import Manager, ma from ncclient.transport import SSHSession from jnpr.junos.exception import JSONLoadError @@ -418,9 +453,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/test_rpcmeta.py py-junos-eznc-2.6. from lxml import etree __author__ = "Nitin Kumar, Rick Sherman" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_serial.py py-junos-eznc-2.6.3/tests/unit/transport/test_serial.py ---- py-junos-eznc-2.6.3.orig/tests/unit/transport/test_serial.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/transport/test_serial.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -3,7 +3,7 @@ try: except ImportError: import unittest @@ -430,9 +466,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_serial.py py-junos- import sys import six -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_netconf.py py-junos-eznc-2.6.3/tests/unit/transport/test_tty_netconf.py ---- py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_netconf.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/transport/test_tty_netconf.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -442,9 +479,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_netconf.py py-j from jnpr.junos.transport.tty_netconf import tty_netconf import six import os -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty.py py-junos-eznc-2.6.3/tests/unit/transport/test_tty.py ---- py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/transport/test_tty.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -454,9 +492,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty.py py-junos-ezn from jnpr.junos.transport.tty import Terminal from jnpr.junos import exception as EzErrors -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_ssh.py py-junos-eznc-2.6.3/tests/unit/transport/test_tty_ssh.py ---- py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_ssh.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/transport/test_tty_ssh.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -466,9 +505,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_ssh.py py-junos from jnpr.junos.transport.tty_ssh import SSH -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_telnet.py py-junos-eznc-2.6.3/tests/unit/transport/test_tty_telnet.py ---- py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_telnet.py 2022-05-03 13:49:10.455645122 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/transport/test_tty_telnet.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -478,9 +518,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/transport/test_tty_telnet.py py-ju from jnpr.junos.transport.tty_telnet import Telnet import six -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_config.py py-junos-eznc-2.6.3/tests/unit/utils/test_config.py ---- py-junos-eznc-2.6.3.orig/tests/unit/utils/test_config.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/utils/test_config.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -19,7 +19,7 @@ from ncclient.manager import Manager, ma from ncclient.transport import SSHSession from ncclient.operations import RPCError, RPCReply @@ -490,9 +531,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_config.py py-junos-eznc from lxml import etree import os -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_fs.py py-junos-eznc-2.6.3/tests/unit/utils/test_fs.py ---- py-junos-eznc-2.6.3.orig/tests/unit/utils/test_fs.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/utils/test_fs.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -9,7 +9,7 @@ from jnpr.junos import Device from jnpr.junos.utils.fs import FS from jnpr.junos.exception import RpcError @@ -502,9 +544,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_fs.py py-junos-eznc-2.6 from lxml import etree __author__ = "Nitin Kumar, Rick Sherman" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_ftp.py py-junos-eznc-2.6.3/tests/unit/utils/test_ftp.py ---- py-junos-eznc-2.6.3.orig/tests/unit/utils/test_ftp.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/utils/test_ftp.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -7,7 +7,7 @@ import os from jnpr.junos import Device import jnpr.junos.utils.ftp @@ -514,9 +557,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_ftp.py py-junos-eznc-2. if sys.version < "3": builtin_string = "__builtin__" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_scp.py py-junos-eznc-2.6.3/tests/unit/utils/test_scp.py ---- py-junos-eznc-2.6.3.orig/tests/unit/utils/test_scp.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/utils/test_scp.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -8,7 +8,7 @@ import pytest from jnpr.junos import Device from jnpr.junos.utils.scp import SCP @@ -526,9 +570,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_scp.py py-junos-eznc-2. __author__ = "Rick Sherman, Nitin Kumar" __credits__ = "Jeremy Schulman" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_start_shell.py py-junos-eznc-2.6.3/tests/unit/utils/test_start_shell.py ---- py-junos-eznc-2.6.3.orig/tests/unit/utils/test_start_shell.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/utils/test_start_shell.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -4,7 +4,7 @@ import pytest from jnpr.junos import Device from jnpr.junos.utils.start_shell import StartShell @@ -538,9 +583,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_start_shell.py py-junos __author__ = "Rick Sherman" __credits__ = "Jeremy Schulman, Nitin Kumar" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_sw.py py-junos-eznc-2.6.3/tests/unit/utils/test_sw.py ---- py-junos-eznc-2.6.3.orig/tests/unit/utils/test_sw.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/utils/test_sw.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -16,7 +16,7 @@ from jnpr.junos.facts.swver import versi from ncclient.manager import Manager, make_device_handler from ncclient.transport import SSHSession @@ -550,9 +596,10 @@ diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_sw.py py-junos-eznc-2.6 if sys.version < "3": builtin_string = "__builtin__" -diff -upr py-junos-eznc-2.6.3.orig/tests/unit/utils/test_util.py py-junos-eznc-2.6.3/tests/unit/utils/test_util.py ---- py-junos-eznc-2.6.3.orig/tests/unit/utils/test_util.py 2022-05-03 13:49:10.463645172 +0200 -+++ py-junos-eznc-2.6.3/tests/unit/utils/test_util.py 2022-05-03 13:49:10.495645373 +0200 +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 @@ -7,7 +7,7 @@ import pytest from jnpr.junos import Device from jnpr.junos.utils.util import Util diff --git a/python-junos-eznc-remove-nose.patch b/python-junos-eznc-remove-nose.patch index 97a5567..412503b 100644 --- a/python-junos-eznc-remove-nose.patch +++ b/python-junos-eznc-remove-nose.patch @@ -1,7 +1,7 @@ -Index: py-junos-eznc-2.5.3/tests/functional/test_core.py +Index: py-junos-eznc-2.6.7/tests/functional/test_core.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/functional/test_core.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/functional/test_core.py 2020-09-18 10:55:50.666532679 +0200 +--- 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: @@ -16,10 +16,10 @@ Index: py-junos-eznc-2.5.3/tests/functional/test_core.py class TestCore(unittest.TestCase): @classmethod def setUpClass(self): -Index: py-junos-eznc-2.5.3/tests/functional/test_device_ssh.py +Index: py-junos-eznc-2.6.7/tests/functional/test_device_ssh.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/functional/test_device_ssh.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/functional/test_device_ssh.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -35,10 +35,10 @@ Index: py-junos-eznc-2.5.3/tests/functional/test_device_ssh.py class TestDeviceSsh(unittest.TestCase): def tearDown(self): self.dev.close() -Index: py-junos-eznc-2.5.3/tests/functional/test_outbound_ssh.py +Index: py-junos-eznc-2.6.7/tests/functional/test_outbound_ssh.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/functional/test_outbound_ssh.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/functional/test_outbound_ssh.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -55,10 +55,10 @@ Index: py-junos-eznc-2.5.3/tests/functional/test_outbound_ssh.py class TestDeviceSsh(unittest.TestCase): def tearDown(self): self.dev.close() -Index: py-junos-eznc-2.5.3/tests/functional/test_table.py +Index: py-junos-eznc-2.6.7/tests/functional/test_table.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/functional/test_table.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/functional/test_table.py 2020-09-18 10:55:50.666532679 +0200 +--- 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: @@ -75,10 +75,10 @@ Index: py-junos-eznc-2.5.3/tests/functional/test_table.py class TestTable(unittest.TestCase): @classmethod def setUpClass(self): -Index: py-junos-eznc-2.5.3/tests/unit/__init__.py +Index: py-junos-eznc-2.6.7/tests/unit/__init__.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/__init__.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/__init__.py 2020-09-18 10:55:50.666532679 +0200 +--- 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 @@ -96,10 +96,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/__init__.py 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.5.3/tests/unit/factory/test_cfgtable.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cfgtable.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_cfgtable.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_cfgtable.py 2020-09-18 10:55:50.666532679 +0200 +--- 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 @@ -118,10 +118,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cfgtable.py @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.5.3/tests/unit/factory/test_cmdtable.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_cmdtable.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_cmdtable.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py 2020-09-18 10:58:14.163423506 +0200 +--- 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 @@ -140,10 +140,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_cmdtable.py class TestFactoryCMDTable(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_factory_cls.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_factory_cls.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_factory_cls.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_factory_cls.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -160,10 +160,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_factory_cls.py class TestFactoryCls(unittest.TestCase): def test_factory_cls_cfgtable(self): t = FactoryCfgTable() -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_factory_loader.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_factory_loader.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_factory_loader.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_factory_loader.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -179,10 +179,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_factory_loader.py class TestFactoryLoader(unittest.TestCase): def setUp(self): self.fl = FactoryLoader() -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_optable.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_optable.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_optable.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_optable.py 2020-09-18 10:55:50.666532679 +0200 +--- 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 @@ -201,10 +201,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_optable.py class TestFactoryOpTable(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_table.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_table.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_table.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_table.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -223,10 +223,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_table.py class TestFactoryTable(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_to_json.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_to_json.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_to_json.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_to_json.py 2020-09-18 10:55:50.666532679 +0200 +--- 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: @@ -245,10 +245,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_to_json.py class TestToJson(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_view.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_view.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_view.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_view.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -267,10 +267,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_view.py class TestFactoryView(unittest.TestCase): def setUp(self): self.dev = Device( -Index: py-junos-eznc-2.5.3/tests/unit/factory/test_view_fields.py +Index: py-junos-eznc-2.6.7/tests/unit/factory/test_view_fields.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/factory/test_view_fields.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/factory/test_view_fields.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -286,10 +286,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/factory/test_view_fields.py class TestFactoryViewFields(unittest.TestCase): def setUp(self): self.vf = ViewFields() -Index: py-junos-eznc-2.5.3/tests/unit/facts/test__init__.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test__init__.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test__init__.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test__init__.py 2020-09-18 10:55:50.666532679 +0200 +--- 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: @@ -307,10 +307,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test__init__.py class TestFactInitialization(unittest.TestCase): def test_duplicate_facts(self): module = importlib.import_module("tests.unit.facts.dupe_foo1") -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_current_re.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_current_re.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_current_re.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_current_re.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -329,10 +329,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_current_re.py class TestCurrentRe(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_domain.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_domain.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_domain.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_domain.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -351,10 +351,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_domain.py class TestDomain(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_ethernet_mac_table.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_ethernet_mac_table.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_ethernet_mac_table.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_ethernet_mac_table.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -373,10 +373,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_ethernet_mac_table.py class TestEthernetMacTable(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_file_list.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_file_list.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_file_list.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_file_list.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -395,10 +395,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_file_list.py class TestFileList(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_chassis_cluster_status.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_cluster_status.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_get_chassis_cluster_status.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_get_chassis_cluster_status.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -417,10 +417,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_chassis_cluster_status.py class TestGetChassisClusterStatus(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_chassis_inventory.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_chassis_inventory.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_get_chassis_inventory.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_get_chassis_inventory.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -439,10 +439,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_chassis_inventory.py class TestChassis(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_route_engine_information.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_route_engine_information.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_get_route_engine_information.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_get_route_engine_information.py 2020-09-18 10:55:50.666532679 +0200 +--- 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" @@ -461,10 +461,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_route_engine_information.py class TestGetRouteEngineInformation(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_software_information.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_software_information.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_get_software_information.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_get_software_information.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -483,10 +483,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_software_information.py class TestGetSoftwareInformation(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_virtual_chassis_information.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_get_virtual_chassis_information.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_get_virtual_chassis_information.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_get_virtual_chassis_information.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -505,10 +505,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_get_virtual_chassis_information class TestGetVirtualChassisInformation(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_ifd_style.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_ifd_style.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_ifd_style.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_ifd_style.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -527,10 +527,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_ifd_style.py class TestIfdStyle(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_iri_mapping.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_iri_mapping.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_iri_mapping.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_iri_mapping.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -549,10 +549,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_iri_mapping.py class TestIriMapping(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_personality.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_personality.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_personality.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_personality.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -571,10 +571,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_personality.py class TestPersonality(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/facts/test_swver.py +Index: py-junos-eznc-2.6.7/tests/unit/facts/test_swver.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/facts/test_swver.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/facts/test_swver.py 2020-09-18 10:55:50.670532704 +0200 +--- 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: @@ -590,10 +590,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/facts/test_swver.py class TestVersionInfo(unittest.TestCase): if six.PY2: assertCountEqual = unittest.TestCase.assertItemsEqual -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_chassis.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_chassis.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_chassis.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_chassis.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -612,10 +612,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_chassis.py class TestChassis(unittest.TestCase): @patch("ncclient.manager.connect") @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_domain.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_domain.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_domain.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_domain.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -634,10 +634,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_domain.py class TestDomain(unittest.TestCase): @patch("ncclient.manager.connect") @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_ifd_style.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_ifd_style.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_ifd_style.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_ifd_style.py 2020-09-18 10:55:50.670532704 +0200 +--- 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 @@ -654,10 +654,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_ifd_style.py class TestIFDStyle(unittest.TestCase): @patch("jnpr.junos.device.warnings") def setUp(self, mock_warnings): -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_personality.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_personality.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_personality.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_personality.py 2020-09-18 10:55:50.670532704 +0200 +--- 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 @@ -674,10 +674,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_personality.py class TestPersonality(unittest.TestCase): @patch("jnpr.junos.device.warnings") def setUp(self, mock_warnings): -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_routing_engines.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_routing_engines.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_routing_engines.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_routing_engines.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -696,10 +696,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_routing_engines.py class TestRoutingEngines(unittest.TestCase): @patch("ncclient.manager.connect") @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_srx_cluster.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_srx_cluster.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_srx_cluster.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_srx_cluster.py 2020-09-18 10:55:50.670532704 +0200 +--- 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" @@ -718,10 +718,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_srx_cluster.py class TestSrxCluster(unittest.TestCase): @patch("ncclient.manager.connect") @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_switch_style.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_switch_style.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_switch_style.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_switch_style.py 2020-09-18 10:55:50.670532704 +0200 +--- 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 @@ -738,10 +738,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_switch_style.py class TestSwitchStyle(unittest.TestCase): @patch("jnpr.junos.device.warnings") def setUp(self, mock_warnings): -Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_swver.py +Index: py-junos-eznc-2.6.7/tests/unit/ofacts/test_swver.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/ofacts/test_swver.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/ofacts/test_swver.py 2020-09-18 10:55:50.670532704 +0200 +--- 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: @@ -760,10 +760,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/ofacts/test_swver.py class TestSwver(unittest.TestCase): @patch("ncclient.manager.connect") @patch("jnpr.junos.device.warnings") -Index: py-junos-eznc-2.5.3/tests/unit/test_console.py +Index: py-junos-eznc-2.6.7/tests/unit/test_console.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_console.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_console.py 2020-09-18 10:55:50.702532904 +0200 +--- 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 @@ -782,10 +782,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_console.py 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.5.3/tests/unit/test_decorators.py +Index: py-junos-eznc-2.6.7/tests/unit/test_decorators.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_decorators.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_decorators.py 2020-09-18 10:55:50.714532979 +0200 +--- 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: @@ -804,10 +804,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_decorators.py class Test_Decorators(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/test_device.py +Index: py-junos-eznc-2.6.7/tests/unit/test_device.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_device.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_device.py 2020-09-18 10:55:50.722533029 +0200 +--- 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: @@ -835,10 +835,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_device.py class TestDevice(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/test_exception.py +Index: py-junos-eznc-2.6.7/tests/unit/test_exception.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_exception.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_exception.py 2020-09-18 10:55:50.730533079 +0200 +--- 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 @@ -855,10 +855,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_exception.py class Test_RpcError(unittest.TestCase): def test_rpcerror_repr(self): rsp = etree.XML(rpc_xml) -Index: py-junos-eznc-2.5.3/tests/unit/test_factcache.py +Index: py-junos-eznc-2.6.7/tests/unit/test_factcache.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_factcache.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_factcache.py 2020-09-18 10:55:50.738533129 +0200 +--- 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: @@ -877,10 +877,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_factcache.py class TestFactCache(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/test_junos.py +Index: py-junos-eznc-2.6.7/tests/unit/test_junos.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_junos.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_junos.py 2020-09-18 10:55:50.746533179 +0200 +--- 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 @@ -898,10 +898,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_junos.py 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.5.3/tests/unit/test_jxml.py +Index: py-junos-eznc-2.6.7/tests/unit/test_jxml.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_jxml.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_jxml.py 2020-09-18 10:55:50.754533228 +0200 +--- 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 @@ -920,10 +920,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_jxml.py class Test_JXML(unittest.TestCase): def test_name(self): op = NAME("test") -Index: py-junos-eznc-2.5.3/tests/unit/test_rpcmeta.py +Index: py-junos-eznc-2.6.7/tests/unit/test_rpcmeta.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/test_rpcmeta.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/test_rpcmeta.py 2020-09-18 10:55:50.762533278 +0200 +--- 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 @@ -942,10 +942,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/test_rpcmeta.py class Test_RpcMetaExec(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/transport/test_serial.py +Index: py-junos-eznc-2.6.7/tests/unit/transport/test_serial.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/transport/test_serial.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/transport/test_serial.py 2020-09-18 10:55:50.762533278 +0200 +--- 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: @@ -973,10 +973,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/transport/test_serial.py 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.5.3/tests/unit/transport/test_tty.py +Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/transport/test_tty.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/transport/test_tty.py 2020-09-18 10:55:50.762533278 +0200 +--- 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 @@ -994,10 +994,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/transport/test_tty.py class TestTTY(unittest.TestCase): def setUp(self): logging.getLogger("jnpr.junos.tty") -Index: py-junos-eznc-2.5.3/tests/unit/transport/test_tty_netconf.py +Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_netconf.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/transport/test_tty_netconf.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/transport/test_tty_netconf.py 2020-09-18 10:55:50.762533278 +0200 +--- 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: @@ -1016,10 +1016,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/transport/test_tty_netconf.py class TestTTYNetconf(unittest.TestCase): def setUp(self): self.tty_net = tty_netconf(MagicMock()) -Index: py-junos-eznc-2.5.3/tests/unit/transport/test_tty_ssh.py +Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_ssh.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/transport/test_tty_ssh.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/transport/test_tty_ssh.py 2020-09-18 10:55:50.762533278 +0200 +--- 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: @@ -1035,10 +1035,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/transport/test_tty_ssh.py class TestTTYSSH(unittest.TestCase): @patch("jnpr.junos.transport.tty_ssh.paramiko") def setUp(self, mock_paramiko): -Index: py-junos-eznc-2.5.3/tests/unit/transport/test_tty_telnet.py +Index: py-junos-eznc-2.6.7/tests/unit/transport/test_tty_telnet.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/transport/test_tty_telnet.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/transport/test_tty_telnet.py 2020-09-18 10:55:50.762533278 +0200 +--- 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: @@ -1055,10 +1055,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/transport/test_tty_telnet.py class TestTTYTelnet(unittest.TestCase): @patch("jnpr.junos.transport.tty_telnet.telnetlib.Telnet") def setUp(self, mpock_telnet): -Index: py-junos-eznc-2.5.3/tests/unit/utils/test_config.py +Index: py-junos-eznc-2.6.7/tests/unit/utils/test_config.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/utils/test_config.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/utils/test_config.py 2020-09-18 10:55:50.766533303 +0200 +--- 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 @@ -1076,10 +1076,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/utils/test_config.py class TestConfig(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/utils/test_fs.py +Index: py-junos-eznc-2.6.7/tests/unit/utils/test_fs.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/utils/test_fs.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/utils/test_fs.py 2020-09-18 10:55:50.766533303 +0200 +--- 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 @@ -1096,10 +1096,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/utils/test_fs.py class TestFS(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/utils/test_ftp.py +Index: py-junos-eznc-2.6.7/tests/unit/utils/test_ftp.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/utils/test_ftp.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/utils/test_ftp.py 2020-09-18 10:55:50.766533303 +0200 +--- 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 @@ -1116,10 +1116,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/utils/test_ftp.py @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.5.3/tests/unit/utils/test_scp.py +Index: py-junos-eznc-2.6.7/tests/unit/utils/test_scp.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/utils/test_scp.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/utils/test_scp.py 2020-09-18 10:55:50.766533303 +0200 +--- 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 @@ -1138,10 +1138,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/utils/test_scp.py class TestScp(unittest.TestCase): def setUp(self): self.dev = Device(host="1.1.1.1") -Index: py-junos-eznc-2.5.3/tests/unit/utils/test_start_shell.py +Index: py-junos-eznc-2.6.7/tests/unit/utils/test_start_shell.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/utils/test_start_shell.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/utils/test_start_shell.py 2020-09-18 10:55:50.766533303 +0200 +--- 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 @@ -1158,10 +1158,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/utils/test_start_shell.py class TestStartShell(unittest.TestCase): @patch("paramiko.SSHClient") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/utils/test_sw.py +Index: py-junos-eznc-2.6.7/tests/unit/utils/test_sw.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/utils/test_sw.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/utils/test_sw.py 2020-09-18 10:55:50.766533303 +0200 +--- 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: @@ -1180,10 +1180,10 @@ Index: py-junos-eznc-2.5.3/tests/unit/utils/test_sw.py class TestSW(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/tests/unit/utils/test_util.py +Index: py-junos-eznc-2.6.7/tests/unit/utils/test_util.py =================================================================== ---- py-junos-eznc-2.5.3.orig/tests/unit/utils/test_util.py 2020-08-25 11:35:29.000000000 +0200 -+++ py-junos-eznc-2.5.3/tests/unit/utils/test_util.py 2020-09-18 10:55:50.766533303 +0200 +--- 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" @@ -1202,12 +1202,30 @@ Index: py-junos-eznc-2.5.3/tests/unit/utils/test_util.py class TestUtil(unittest.TestCase): @patch("ncclient.manager.connect") def setUp(self, mock_connect): -Index: py-junos-eznc-2.5.3/pytest.ini +Index: py-junos-eznc-2.6.7/pytest.ini =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ py-junos-eznc-2.5.3/pytest.ini 2020-09-18 11:02:32.057024480 +0200 +--- /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.changes b/python-junos-eznc.changes index 1f1de85..c481643 100644 --- a/python-junos-eznc.changes +++ b/python-junos-eznc.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Mar 2 07:14:57 UTC 2023 - Daniel Garcia + +- Add python-311.patch to support python 3.11, gh#Juniper/py-junos-eznc#1236 +- Remove python-junos-eznc-fix-unittests.patch, not needed anymore +- Update to 2.6.7: + * Supported option to set look_for_keys with bool True/False #1234 + * Fixed build failure against setuptools #1231 +- 2.6.6 + * Fixed reboot failing on other RE #1199 + * Fixed passing 'sleep' arg to StartShell run() #1202 + * Fixed PyEZ get-facts support for ACX model #1209 + * Fixed EthPortTable regex pattern #1215 + * Fixed StartShell UnboundLocalError #1203 #1211 +- 2.6.5 + * Supported multi-gig ports for EthPortTable.yml #1177 + * Fixed on-box support for start shell types #1190 #1186 + * Fixed conn_open_timeout value was getting set None , changed it to + default 30 seconds #1184 +- 2.6.4 + * Supported start_shell options to choose the shell types (sh or csh) #995 + * Supported for python 3.9 + * Fixed Device facts current_re returns the SRX cluster node0 and + node1 details with cluster ID 16 #1135 + * Fixed upgrade ncclient version 0.6.13, updated requirements.txt to + install ncclient==0.6.13 #1153 + * Fixed deprecation warning due to invalid escape sequences #1034 + * Fixed Unit tests test_sw_put_ftp failure #1165 + ------------------------------------------------------------------- Tue May 3 11:54:14 UTC 2022 - pgajdos@suse.com diff --git a/python-junos-eznc.spec b/python-junos-eznc.spec index b961c51..e854a71 100644 --- a/python-junos-eznc.spec +++ b/python-junos-eznc.spec @@ -1,7 +1,7 @@ # # spec file for package python-junos-eznc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2017-2020, Martin Hauke # # All modifications and additions to the file contributed by third parties @@ -17,10 +17,9 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-junos-eznc -Version: 2.6.3 +Version: 2.6.7 Release: 0 Summary: Junos 'EZ' automation for non-programmers License: Apache-2.0 @@ -32,14 +31,14 @@ 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 -# https://github.com/Juniper/py-junos-eznc/commit/96f25bb8aa006e12e48902a91a1dc6ff595bdd2d -Patch2: python-junos-eznc-fix-unittests.patch # https://github.com/Juniper/py-junos-eznc/issues/1176 Patch3: python-junos-eznc-no-mock.patch +# PATCH-FIX-OPENSUSE python-311.patch gh#Juniper/py-junos-eznc#1236 +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.9} +BuildRequires: %{python_module ncclient >= 0.6.13} BuildRequires: %{python_module netaddr} BuildRequires: %{python_module ntc-templates} BuildRequires: %{python_module paramiko >= 1.15.2} @@ -57,7 +56,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.9 +Requires: python-ncclient >= 0.6.13 Requires: python-netaddr Requires: python-ntc-templates Requires: python-paramiko >= 1.15.2