pool/python-junos-eznc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 974649 from home:pgajdos:python

Browse Source 
- added patches
  fix https://github.com/Juniper/py-junos-eznc/issues/1176
  + python-junos-eznc-no-mock.patch

- added patches
  fix 96f25bb8aa
  + python-junos-eznc-fix-unittests.patch

OBS-URL: https://build.opensuse.org/request/show/974649
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=24
This commit is contained in:
Matej Cepl 2022-05-03 17:57:18 +00:00 committed by Git OBS Bridge
parent 47bd77fc46
commit 67a96a203e
4 changed files with 652 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
python-junos-eznc-fix-unittests.patch Normal file
View File

@ -0,0 +1,70 @@
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("<root><a>test</a></root>")
- 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__")

564
python-junos-eznc-no-mock.patch Normal file
View File

@ -0,0 +1,564 @@
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
@@ -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
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
@@ -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
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
@@ -4,7 +4,7 @@ __credits__ = "Jeremy Schulman"
import unittest
import pytest
from jnpr.junos.factory import FactoryLoader
-from mock import patch
+from unittest.mock import patch
@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
@@ -19,7 +19,7 @@ from ncclient.operations.rpc import RPCR
from lxml import etree
-from mock import patch
+from unittest.mock import patch
@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
@@ -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
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
@@ -5,7 +5,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import patch
+from unittest.mock import patch
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
import unittest
import pytest
-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
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -2,7 +2,7 @@ import unittest
import sys
import pytest
-from mock import patch
+from unittest.mock import patch
__author__ = "Nitin Kumar"
__credits__ = "Jeremy Schulman"
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
__credits__ = "Jeremy Schulman"
import unittest
-from mock import patch
+from unittest.mock import patch
import pytest
from jnpr.junos import Device
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
@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
__credits__ = "Jeremy Schulman"
import unittest
-from mock import patch
+from unittest.mock import patch
import pytest
from jnpr.junos import Device
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
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
@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
import unittest
import pytest
-from mock import patch
+from unittest.mock import patch
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
@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
__credits__ = "Jeremy Schulman"
import unittest
-from mock import patch
+from unittest.mock import patch
import pytest
from jnpr.junos import Device
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
@@ -6,7 +6,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
import os
from jnpr.junos import Device
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
@@ -4,7 +4,7 @@ except ImportError:
import unittest
from jnpr.junos.utils.config import Config
import pytest
-from mock import patch, MagicMock, call
+from unittest.mock import patch, MagicMock, call
import re
import sys
import os
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
@@ -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
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
@@ -3,7 +3,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import MagicMock, patch, mock_open, call
+from unittest.mock import MagicMock, patch, mock_open, call
import os
from lxml import etree
import sys
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
@@ -3,7 +3,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import patch, MagicMock, call
+from unittest.mock import patch, MagicMock, call
from jnpr.junos.exception import FactLoopError
from jnpr.junos import Device
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
@@ -4,7 +4,7 @@ import unittest
import sys
import pytest
-from mock import patch
+from unittest.mock import patch
__author__ = "Nitin Kumar"
__credits__ = "Jeremy Schulman"
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
@@ -2,7 +2,7 @@ import os
import unittest
from io import StringIO
import pytest
-from mock import patch
+from unittest.mock import patch
from jnpr.junos.jxml import (
NAME,
INSERT,
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
@@ -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"
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
@@ -3,7 +3,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
import sys
import six
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
@@ -3,7 +3,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
from jnpr.junos.transport.tty_netconf import tty_netconf
import six
import os
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
@@ -6,7 +6,7 @@ except ImportError:
import unittest
import pytest
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
from jnpr.junos.transport.tty import Terminal
from jnpr.junos import exception as EzErrors
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
@@ -6,7 +6,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
from jnpr.junos.transport.tty_ssh import SSH
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
@@ -5,7 +5,7 @@ try:
except ImportError:
import unittest
import pytest
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
from jnpr.junos.transport.tty_telnet import Telnet
import six
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
@@ -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
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
@@ -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"
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
@@ -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__"
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
@@ -8,7 +8,7 @@ import pytest
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"
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
@@ -4,7 +4,7 @@ import pytest
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"
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
@@ -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__"
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
@@ -7,7 +7,7 @@ import pytest
from jnpr.junos import Device
from jnpr.junos.utils.util import Util
-from mock import patch
+from unittest.mock import patch
@pytest.mark.unit

14
python-junos-eznc.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue May 3 11:54:14 UTC 2022 - pgajdos@suse.com
- added patches
fix https://github.com/Juniper/py-junos-eznc/issues/1176
+ python-junos-eznc-no-mock.patch
-------------------------------------------------------------------
Tue May 3 11:48:41 UTC 2022 - pgajdos@suse.com
- added patches
fix https://github.com/Juniper/py-junos-eznc/commit/96f25bb8aa006e12e48902a91a1dc6ff595bdd2d
+ python-junos-eznc-fix-unittests.patch
-------------------------------------------------------------------
Tue Jan 11 20:48:52 UTC 2022 - Ben Greiner <code@bnavigator.de>

5
python-junos-eznc.spec
View File

@ -32,10 +32,13 @@ 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
BuildRequires: %{python_module Jinja2 >= 2.7.1}
BuildRequires: %{python_module PyYAML >= 5.1}
BuildRequires: %{python_module lxml >= 3.2.4}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module ncclient >= 0.6.9}
BuildRequires: %{python_module netaddr}
BuildRequires: %{python_module ntc-templates}