forked from pool/python-junos-eznc
- Support added for Python 3.10 and above version.
- 2.6.8:
- Introduced optional argument routing instance for fs.cp() API
- Introduced optional argument member_id for installation of pkg on
specific member id of EX-VC
- Changed the VlanTable field name to vlan-name and BfdSessionTable
field name to client-name #423
- Fixed the port details in StartShell to use the port from Device
object instead of default Port 22 #573
- Fixed the sw.install to use Windows file path for package copy
#1206
- Fixed the sw.install to install the vc_master after the other
vc_members gets installed for EX-3400 where unlink is set by
default #1247
- Removed Unused Dependency: Netaddr #1257
- Fixed "object": version_info(re_version) emits ValueError: invalid
literal for int() with base 10: '17-EVO' for EVO version
X50.17-EVO#1264
- Drop python-junos-eznc-remove-nose.patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=28
612 lines
22 KiB
Diff
612 lines
22 KiB
Diff
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cfgtable.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cfgtable.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_cfgtable.py
|
|
@@ -13,7 +13,7 @@ from jnpr.junos import Device
|
|
from ncclient.manager import Manager, make_device_handler
|
|
from ncclient.transport import SSHSession
|
|
from lxml import etree
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
|
|
from jnpr.junos.factory import loadyaml
|
|
from jnpr.junos.factory.factory_loader import FactoryLoader
|
|
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cmdtable.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
|
|
@@ -10,7 +10,7 @@ from jnpr.junos.exception import RpcErro
|
|
|
|
from ncclient.manager import Manager, make_device_handler
|
|
from ncclient.transport import SSHSession
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
import yamlloader
|
|
from jnpr.junos.factory.factory_loader import FactoryLoader
|
|
import yaml
|
|
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_factory_loader.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_factory_loader.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_factory_loader.py
|
|
@@ -4,7 +4,7 @@ __credits__ = "Jeremy Schulman"
|
|
import unittest
|
|
import nose2
|
|
from jnpr.junos.factory import FactoryLoader
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
|
|
class TestFactoryLoader(unittest.TestCase):
|
|
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_optable.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_optable.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_optable.py
|
|
@@ -19,7 +19,7 @@ from ncclient.operations.rpc import RPCR
|
|
|
|
from lxml import etree
|
|
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
|
|
class TestFactoryOpTable(unittest.TestCase):
|
|
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_table.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_table.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_table.py
|
|
@@ -8,7 +8,7 @@ import os
|
|
from jnpr.junos import Device
|
|
from jnpr.junos.factory.table import Table
|
|
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
from lxml import etree
|
|
from jnpr.junos.op.phyport import PhyPortTable
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_to_json.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_to_json.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_to_json.py
|
|
@@ -5,7 +5,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
import os
|
|
import json
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_view.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_view.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_view.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
from jnpr.junos import Device
|
|
from jnpr.junos.factory.view import View
|
|
from jnpr.junos.op.phyport import PhyPortStatsTable, PhyPortStatsView
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_current_re.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_current_re.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_current_re.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from lxml import etree
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_domain.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_domain.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_domain.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from lxml import etree
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_ethernet_mac_table.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_ethernet_mac_table.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_ethernet_mac_table.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from lxml import etree
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_file_list.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_file_list.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_file_list.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_cluster_status.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_chassis_cluster_status.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_cluster_status.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from lxml import etree
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_inventory.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_chassis_inventory.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_inventory.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_route_engine_information.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_route_engine_information.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_route_engine_information.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from lxml import etree
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_software_information.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_software_information.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_software_information.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from lxml import etree
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_virtual_chassis_information.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_virtual_chassis_information.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_virtual_chassis_information.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
import sys
|
|
from lxml import etree
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_ifd_style.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_ifd_style.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_ifd_style.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from lxml import etree
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_iri_mapping.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_iri_mapping.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_iri_mapping.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/facts/test_personality.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_personality.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/facts/test_personality.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
from jnpr.junos.exception import RpcError
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_chassis.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_chassis.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_chassis.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
from lxml import etree
|
|
import os
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_domain.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_domain.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_domain.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
from lxml import etree
|
|
|
|
from jnpr.junos.ofacts.domain import facts_domain
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_ifd_style.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_ifd_style.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_ifd_style.py
|
|
@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
|
|
__credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
import nose2
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_personality.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_personality.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_personality.py
|
|
@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
|
|
__credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
import nose2
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_routing_engines.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_routing_engines.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_routing_engines.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
import sys
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_srx_cluster.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_srx_cluster.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_srx_cluster.py
|
|
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
import os
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/test_decorators.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/test_decorators.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/test_decorators.py
|
|
@@ -12,7 +12,7 @@ from jnpr.junos.exception import RpcErro
|
|
from jnpr.junos.decorators import timeoutDecorator, normalizeDecorator
|
|
from jnpr.junos.decorators import ignoreWarnDecorator
|
|
|
|
-from mock import patch, MagicMock, PropertyMock, call
|
|
+from unittest.mock import patch, MagicMock, PropertyMock, call
|
|
|
|
from ncclient.operations.rpc import RPCError
|
|
from ncclient.manager import Manager, make_device_handler
|
|
Index: py-junos-eznc-2.7.0/tests/unit/test_rpcmeta.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/test_rpcmeta.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/test_rpcmeta.py
|
|
@@ -10,7 +10,7 @@ from ncclient.manager import Manager, ma
|
|
from ncclient.transport import SSHSession
|
|
from jnpr.junos.exception import JSONLoadError
|
|
|
|
-from mock import patch, MagicMock, call
|
|
+from unittest.mock import patch, MagicMock, call
|
|
from lxml import etree
|
|
|
|
__author__ = "Nitin Kumar, Rick Sherman"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/utils/test_config.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_config.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/utils/test_config.py
|
|
@@ -19,7 +19,7 @@ from ncclient.manager import Manager, ma
|
|
from ncclient.transport import SSHSession
|
|
from ncclient.operations import RPCError, RPCReply
|
|
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
from lxml import etree
|
|
import os
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/utils/test_fs.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_fs.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/utils/test_fs.py
|
|
@@ -9,7 +9,7 @@ from jnpr.junos import Device
|
|
from jnpr.junos.utils.fs import FS
|
|
from jnpr.junos.exception import RpcError
|
|
|
|
-from mock import patch, MagicMock, call
|
|
+from unittest.mock import patch, MagicMock, call
|
|
from lxml import etree
|
|
|
|
__author__ = "Nitin Kumar, Rick Sherman"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/utils/test_ftp.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_ftp.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/utils/test_ftp.py
|
|
@@ -7,7 +7,7 @@ import os
|
|
from jnpr.junos import Device
|
|
import jnpr.junos.utils.ftp
|
|
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
if sys.version < "3":
|
|
builtin_string = "__builtin__"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/utils/test_scp.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_scp.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/utils/test_scp.py
|
|
@@ -8,7 +8,7 @@ import nose2
|
|
from jnpr.junos import Device
|
|
from jnpr.junos.utils.scp import SCP
|
|
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
__author__ = "Rick Sherman, Nitin Kumar"
|
|
__credits__ = "Jeremy Schulman"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/utils/test_start_shell.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_start_shell.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/utils/test_start_shell.py
|
|
@@ -4,7 +4,7 @@ import nose2
|
|
from jnpr.junos import Device
|
|
from jnpr.junos.utils.start_shell import StartShell
|
|
|
|
-from mock import patch, MagicMock, call
|
|
+from unittest.mock import patch, MagicMock, call
|
|
|
|
__author__ = "Rick Sherman"
|
|
__credits__ = "Jeremy Schulman, Nitin Kumar"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/utils/test_sw.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_sw.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/utils/test_sw.py
|
|
@@ -16,7 +16,7 @@ from jnpr.junos.facts.swver import versi
|
|
from ncclient.manager import Manager, make_device_handler
|
|
from ncclient.transport import SSHSession
|
|
from lxml import etree
|
|
-from mock import patch, MagicMock, call, mock_open
|
|
+from unittest.mock import patch, MagicMock, call, mock_open
|
|
|
|
if sys.version < "3":
|
|
builtin_string = "__builtin__"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/utils/test_util.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_util.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/utils/test_util.py
|
|
@@ -7,7 +7,7 @@ import nose2
|
|
from jnpr.junos import Device
|
|
from jnpr.junos.utils.util import Util
|
|
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
|
|
class TestUtil(unittest.TestCase):
|
|
Index: py-junos-eznc-2.7.0/tests/unit/__init__.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/__init__.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/__init__.py
|
|
@@ -2,7 +2,7 @@ import unittest
|
|
import sys
|
|
|
|
import nose2
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
__author__ = "Nitin Kumar"
|
|
__credits__ = "Jeremy Schulman"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_switch_style.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_switch_style.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_switch_style.py
|
|
@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
|
|
__credits__ = "Jeremy Schulman"
|
|
|
|
import unittest
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
import nose2
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_swver.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_swver.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_swver.py
|
|
@@ -6,7 +6,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock
|
|
+from unittest.mock import patch, MagicMock
|
|
import os
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/test_console.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/test_console.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/test_console.py
|
|
@@ -4,7 +4,7 @@ except ImportError:
|
|
import unittest
|
|
from jnpr.junos.utils.config import Config
|
|
import nose2
|
|
-from mock import patch, MagicMock, call
|
|
+from unittest.mock import patch, MagicMock, call
|
|
import re
|
|
import sys
|
|
import os
|
|
Index: py-junos-eznc-2.7.0/tests/unit/test_device.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/test_device.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/test_device.py
|
|
@@ -3,7 +3,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import MagicMock, patch, mock_open, call
|
|
+from unittest.mock import MagicMock, patch, mock_open, call
|
|
import os
|
|
from lxml import etree
|
|
import sys
|
|
Index: py-junos-eznc-2.7.0/tests/unit/test_factcache.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/test_factcache.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/test_factcache.py
|
|
@@ -3,7 +3,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import patch, MagicMock, call
|
|
+from unittest.mock import patch, MagicMock, call
|
|
from jnpr.junos.exception import FactLoopError
|
|
|
|
from jnpr.junos import Device
|
|
Index: py-junos-eznc-2.7.0/tests/unit/test_junos.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/test_junos.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/test_junos.py
|
|
@@ -4,7 +4,7 @@ import unittest
|
|
import sys
|
|
|
|
import nose2
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
|
|
__author__ = "Nitin Kumar"
|
|
__credits__ = "Jeremy Schulman"
|
|
Index: py-junos-eznc-2.7.0/tests/unit/test_jxml.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/test_jxml.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/test_jxml.py
|
|
@@ -2,7 +2,7 @@ import os
|
|
import unittest
|
|
from io import StringIO
|
|
import nose2
|
|
-from mock import patch
|
|
+from unittest.mock import patch
|
|
from jnpr.junos.jxml import (
|
|
NAME,
|
|
INSERT,
|
|
Index: py-junos-eznc-2.7.0/tests/unit/transport/test_serial.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_serial.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/transport/test_serial.py
|
|
@@ -3,7 +3,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
import sys
|
|
import six
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty.py
|
|
@@ -6,7 +6,7 @@ except ImportError:
|
|
import unittest
|
|
|
|
import nose2
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
|
|
from jnpr.junos.transport.tty import Terminal
|
|
from jnpr.junos import exception as EzErrors
|
|
Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_netconf.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_netconf.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_netconf.py
|
|
@@ -3,7 +3,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
|
|
from jnpr.junos.transport.tty_netconf import tty_netconf
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_ssh.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_ssh.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_ssh.py
|
|
@@ -6,7 +6,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
from jnpr.junos.transport.tty_ssh import SSH
|
|
|
|
|
|
Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_telnet.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_telnet.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_telnet.py
|
|
@@ -5,7 +5,7 @@ try:
|
|
except ImportError:
|
|
import unittest
|
|
import nose2
|
|
-from mock import MagicMock, patch
|
|
+from unittest.mock import MagicMock, patch
|
|
from jnpr.junos.transport.tty_telnet import Telnet
|
|
import six
|
|
|