From 3d165124238e05ecd515d87d55a966ef1badf672 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 20 May 2019 10:43:50 +0900 Subject: [PATCH] test-network: convert jiffies to sec --- test/test-network/systemd-networkd-tests.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 427d3840aa7..d257d92e1af 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -448,14 +448,15 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.wait_online(['bridge99:off']) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge', 'hello_time')) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge', 'max_age')) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge','forward_delay')) - self.assertEqual('900', self.read_link_attr('bridge99', 'bridge','ageing_time')) - self.assertEqual('9', self.read_link_attr('bridge99', 'bridge','priority')) - self.assertEqual('1', self.read_link_attr('bridge99', 'bridge','multicast_querier')) - self.assertEqual('1', self.read_link_attr('bridge99', 'bridge','multicast_snooping')) - self.assertEqual('1', self.read_link_attr('bridge99', 'bridge','stp_state')) + tick = os.sysconf('SC_CLK_TCK') + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge', 'hello_time')) / tick)) + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge', 'max_age')) / tick)) + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge','forward_delay')) / tick)) + self.assertEqual(9, round(float(self.read_link_attr('bridge99', 'bridge','ageing_time')) / tick)) + self.assertEqual(9, int(self.read_link_attr('bridge99', 'bridge','priority'))) + self.assertEqual(1, int(self.read_link_attr('bridge99', 'bridge','multicast_querier'))) + self.assertEqual(1, int(self.read_link_attr('bridge99', 'bridge','multicast_snooping'))) + self.assertEqual(1, int(self.read_link_attr('bridge99', 'bridge','stp_state'))) def test_bond(self): self.copy_unit_to_networkd_unit_path('25-bond.netdev', '25-bond-balanced-tlb.netdev') -- 2.39.2