Merge pull request #1040 from pgajdos/master

drop hard dependency on unittest2

development.txt

@@ -6,4 +6,3 @@ nose         # http://nose.readthedocs.org/en/latest/
 pep8	     # https://github.com/jcrocholl/pep8
 pyflakes	 # https://launchpad.net/pyflakes
 coveralls	 # https://coveralls.io/
-unittest2>=0.5.1  # https://pypi.python.org/pypi/unittest2

tests/functional/test_core.py

@@ -1,6 +1,9 @@
 __author__ = "rsherman, vnitinv"
 
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from jnpr.junos.exception import RpcTimeoutError
 

tests/functional/test_table.py

@@ -1,6 +1,9 @@
 __author__ = "rsherman, vnitinv"
 
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 
 from jnpr.junos.op.routes import RouteTable

tests/unit/factory/test_to_json.py

@@ -1,6 +1,9 @@
 __author__ = "Rick Sherman"
 
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import patch
 import os

tests/unit/facts/test__init__.py

@@ -1,7 +1,10 @@
 __author__ = "Stacy Smith"
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 import importlib
 import sys

tests/unit/facts/test_swver.py

@@ -1,25 +1,30 @@
 __author__ = "Stacy Smith"
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
-import unittest2 as unittest
+import six
+try:
+    import unittest2 as unittest
+except:
+    import unittest
 from nose.plugins.attrib import attr
 
 from jnpr.junos.facts.swver import version_info, get_facts
 
 
 @attr('unit')
 class TestVersionInfo(unittest.TestCase):
-
+    if six.PY2:
+        assertCountEqual = unittest.TestCase.assertItemsEqual
     def test_version_info_after_type_len_else(self):
         self.assertEqual(version_info('12.1X46-D10').build, None)
 
     def test_version_info_X_type_non_hyphenated(self):
-        self.assertItemsEqual(
+        self.assertCountEqual(
             version_info('11.4X12.2'),
             [('build', 2), ('major', (11, 4)), ('minor', '12'), ('type', 'X')])
 
     def test_version_info_X_type_non_hyphenated_nobuild(self):
-        self.assertItemsEqual(
+        self.assertCountEqual(
             version_info('11.4X12'),
             [('build', None), ('major', (11, 4)), ('minor', '12'), ('type', 'X')])
 
@@ -61,12 +66,12 @@ def test_version_to_yaml(self):
             "build: 5\nmajor: !!python/tuple\n- 11\n- 4\nminor: '7'\ntype: R\n")
 
     def test_version_iter(self):
-        self.assertItemsEqual(
+        self.assertCountEqual(
             version_info('11.4R7.5'),
             [('build', 5), ('major', (11, 4)), ('minor', '7'), ('type', 'R')])
 
     def test_version_feature_velocity(self):
-        self.assertItemsEqual(
+        self.assertCountEqual(
             version_info('15.4F7.5'),
             [('build', 5), ('major', (15, 4)), ('minor', '7'), ('type', 'F')])
 

tests/unit/ofacts/test_swver.py

@@ -1,7 +1,10 @@
 __author__ = "Nitin Kumar, Rick Sherman"
 __credits__ = "Jeremy Schulman"
 
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import patch, MagicMock
 import os

tests/unit/test_console.py

@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from jnpr.junos.utils.config import Config
 from nose.plugins.attrib import attr
 from mock import patch, MagicMock, call

tests/unit/test_decorators.py

@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 
 from lxml.etree import XML

tests/unit/test_device.py

@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import MagicMock, patch, mock_open, call
 import os

tests/unit/test_factcache.py

@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import patch, MagicMock, call
 from jnpr.junos.exception import FactLoopError

tests/unit/transport/test_serial.py

@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import MagicMock, patch
 import sys

tests/unit/transport/test_tty.py

@@ -1,5 +1,8 @@
 import logging
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from nose.plugins.attrib import attr
 from mock import MagicMock, patch

tests/unit/transport/test_tty_netconf.py

@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import MagicMock, patch
 from jnpr.junos.transport.tty_netconf import tty_netconf

tests/unit/transport/test_tty_ssh.py

@@ -1,6 +1,9 @@
 import socket
 import sys
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import MagicMock, patch
 from jnpr.junos.transport.tty_ssh import SSH

tests/unit/transport/test_tty_telnet.py

@@ -1,5 +1,8 @@
 import sys
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from mock import MagicMock, patch
 from jnpr.junos.transport.tty_telnet import Telnet

tests/unit/utils/test_sw.py

@@ -2,7 +2,10 @@
 import os
 import sys
 from six import StringIO
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from nose.plugins.attrib import attr
 from contextlib import contextmanager
 from jnpr.junos import Device