summaryrefslogtreecommitdiffstats
path: root/tests/unit/network_services/helpers
diff options
context:
space:
mode:
authorAbhijit Sinha <abhijit.sinha@intel.com>2018-03-02 15:39:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-02 15:39:36 +0000
commita74ad5a1ec1a73389c5983440b2031b0bc72cea1 (patch)
tree7c13c3b78cb8ae81219c7b9907f87dec7c499b3c /tests/unit/network_services/helpers
parentc27266f509dd1fb07d7b03e5c6befe489a95a423 (diff)
parent97cb29356bee55639cb3e3343aae50abec2d329e (diff)
Merge "Replace assertEqual(None, xx) with assertIsNone(xx)"
Diffstat (limited to 'tests/unit/network_services/helpers')
-rw-r--r--tests/unit/network_services/helpers/test_samplevnf_helper.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/unit/network_services/helpers/test_samplevnf_helper.py b/tests/unit/network_services/helpers/test_samplevnf_helper.py
index 6152263e2..48dfb5f0a 100644
--- a/tests/unit/network_services/helpers/test_samplevnf_helper.py
+++ b/tests/unit/network_services/helpers/test_samplevnf_helper.py
@@ -212,7 +212,7 @@ class TestMultiPortConfig(unittest.TestCase):
opnfv_vnf.socket = 0
opnfv_vnf.start_core = 0
opnfv_vnf.update_write_parser = mock.MagicMock()
- self.assertEqual(None, opnfv_vnf.update_timer())
+ self.assertIsNone(opnfv_vnf.update_timer())
def test_generate_script(self):
topology_file = mock.Mock()
@@ -696,14 +696,14 @@ class TestMultiPortConfig(unittest.TestCase):
opnfv_vnf.worker_config = '1t'
opnfv_vnf.start_core = 0
result = opnfv_vnf.generate_next_core_id()
- self.assertEqual(None, result)
+ self.assertIsNone(result)
opnfv_vnf.worker_config = '2t'
opnfv_vnf.start_core = 'a'
self.assertRaises(ValueError, opnfv_vnf.generate_next_core_id)
opnfv_vnf.worker_config = '2t'
opnfv_vnf.start_core = 1
result = opnfv_vnf.generate_next_core_id()
- self.assertEqual(None, result)
+ self.assertIsNone(result)
def test_generate_lb_to_port_pair_mapping(self):
topology_file = mock.Mock()
@@ -730,7 +730,7 @@ class TestMultiPortConfig(unittest.TestCase):
opnfv_vnf._port_pairs = samplevnf_helper.PortPairs(vnfd_mock.interfaces)
opnfv_vnf.port_pair_list = opnfv_vnf._port_pairs.port_pair_list
result = opnfv_vnf.generate_lb_to_port_pair_mapping()
- self.assertEqual(None, result)
+ self.assertIsNone(result)
result = opnfv_vnf.set_priv_to_pub_mapping()
self.assertEqual('(0,1)', result)
@@ -759,7 +759,7 @@ class TestMultiPortConfig(unittest.TestCase):
opnfv_vnf.start_core = 0
opnfv_vnf.lb_count = 1
result = opnfv_vnf.set_priv_que_handler()
- self.assertEqual(None, result)
+ self.assertIsNone(result)
def test_generate_arp_route_tbl(self):
# ELF: could n=do this in setup