From e7c9a93702214f9891d05b352f0781551018052b Mon Sep 17 00:00:00 2001 From: Gerard de Leeuw Date: Mon, 2 Sep 2024 16:21:41 +0200 Subject: [PATCH 1/2] test: use assertEqual instead of assertEquals --- vppcfg/config/test_acl.py | 12 ++++++------ vppcfg/config/test_prefixlist.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vppcfg/config/test_acl.py b/vppcfg/config/test_acl.py index 6b719a4..524dcae 100644 --- a/vppcfg/config/test_acl.py +++ b/vppcfg/config/test_acl.py @@ -130,28 +130,28 @@ def test_get_network_list(self): for s in ["192.0.2.1", "192.0.2.1/24", "2001:db8::1", "2001:db8::1/64"]: l = acl.get_network_list(self.cfg, s) self.assertIsInstance(l, list) - self.assertEquals(1, len(l)) + self.assertEqual(1, len(l)) n = l[0] l = acl.get_network_list(self.cfg, "trusted") self.assertIsInstance(l, list) - self.assertEquals(5, len(l)) + self.assertEqual(5, len(l)) l = acl.get_network_list(self.cfg, "trusted", want_ipv6=False) self.assertIsInstance(l, list) - self.assertEquals(2, len(l)) + self.assertEqual(2, len(l)) l = acl.get_network_list(self.cfg, "trusted", want_ipv4=False) self.assertIsInstance(l, list) - self.assertEquals(3, len(l)) + self.assertEqual(3, len(l)) l = acl.get_network_list(self.cfg, "trusted", want_ipv4=False, want_ipv6=False) self.assertIsInstance(l, list) - self.assertEquals(0, len(l)) + self.assertEqual(0, len(l)) l = acl.get_network_list(self.cfg, "pl-notexist") self.assertIsInstance(l, list) - self.assertEquals(0, len(l)) + self.assertEqual(0, len(l)) def test_network_list_has_family(self): l = acl.get_network_list(self.cfg, "trusted") diff --git a/vppcfg/config/test_prefixlist.py b/vppcfg/config/test_prefixlist.py index d0f37bc..2f7013f 100644 --- a/vppcfg/config/test_prefixlist.py +++ b/vppcfg/config/test_prefixlist.py @@ -79,22 +79,22 @@ def test_is_empty(self): def test_get_network_list(self): l = prefixlist.get_network_list(self.cfg, "trusted") self.assertIsInstance(l, list) - self.assertEquals(5, len(l)) + self.assertEqual(5, len(l)) l = prefixlist.get_network_list(self.cfg, "trusted", want_ipv6=False) self.assertIsInstance(l, list) - self.assertEquals(2, len(l)) + self.assertEqual(2, len(l)) l = prefixlist.get_network_list(self.cfg, "trusted", want_ipv4=False) self.assertIsInstance(l, list) - self.assertEquals(3, len(l)) + self.assertEqual(3, len(l)) l = prefixlist.get_network_list( self.cfg, "trusted", want_ipv4=False, want_ipv6=False ) self.assertIsInstance(l, list) - self.assertEquals(0, len(l)) + self.assertEqual(0, len(l)) l = prefixlist.get_network_list(self.cfg, "pl-notexist") self.assertIsInstance(l, list) - self.assertEquals(0, len(l)) + self.assertEqual(0, len(l)) From 55700429de79105142491964d6c7c578a9b68d66 Mon Sep 17 00:00:00 2001 From: Gerard de Leeuw Date: Mon, 2 Sep 2024 16:21:51 +0200 Subject: [PATCH 2/2] Update debian dependencies --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index c825b3d..d5c7b24 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: vppcfg Section: python Priority: extra Maintainer: Ray Kinsella -Build-Depends: debhelper (>= 9), python3-all, dh-python +Build-Depends: debhelper (>= 9), python3-all, python3-setuptools, dh-python Standards-Version: 3.9.5 Package: vppcfg Architecture: any -Pre-Depends: dpkg (>= 1.16.1), python3 (>=3.8), ${misc:Pre-Depends} -Depends: python3-netaddr, python3-ipaddr, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${python3:Depends}, python3-importlib-metadata, python3-yamale, python3-vpp-api Description: A configuration tool for FD.io VPP