From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 8 Jul 2019 12:08:10 +0000 (+0900)
Subject: test-network: drop test_udev_driver as it is unstable
X-Git-Tag: v243~274
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cef94248ff30f605dfeef30d4bb978124d51b528;p=platform%2Fupstream%2Fsystemd.git

test-network: drop test_udev_driver as it is unstable

The test unexpectedly succeeds on KVM with sanitizer CI.
At least tentatively, let's drop the test.
---

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 7e9a4ee..4472cf4 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -111,23 +111,6 @@ def expectedFailureIfLinkFileFieldIsNotSet():
 
     return f
 
-def expectedFailureIfEthtoolDoesNotSupportDriver():
-    def f(func):
-        support = False
-        rc = call('ip link add name dummy99 type dummy')
-        if rc == 0:
-            ret = run('udevadm info -w10s /sys/class/net/dummy99', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            if ret.returncode == 0 and 'E: ID_NET_DRIVER=dummy' in ret.stdout.rstrip():
-                support = True
-            call('ip link del dummy99')
-
-        if support:
-            return func
-        else:
-            return unittest.expectedFailure(func)
-
-    return f
-
 def setUpModule():
     os.makedirs(network_unit_file_path, exist_ok=True)
     os.makedirs(networkd_ci_path, exist_ok=True)
@@ -464,23 +447,6 @@ class NetworkctlTests(unittest.TestCase, Utilities):
         self.assertRegex(output, r'Link File: (?:/usr)/lib/systemd/network/99-default.link')
         self.assertRegex(output, r'Network File: n/a')
 
-    @expectedFailureIfEthtoolDoesNotSupportDriver()
-    def test_udev_driver(self):
-        copy_unit_to_networkd_unit_path('11-dummy.netdev', '11-dummy.network',
-                                        '25-veth.netdev', 'netdev-link-local-addressing-yes.network')
-        start_networkd()
-
-        wait_online(['test1:degraded', 'veth99:degraded', 'veth-peer:degraded'])
-
-        output = check_output(*networkctl_cmd, 'status', 'test1', env=env)
-        self.assertRegex(output, 'Driver: dummy')
-
-        output = check_output(*networkctl_cmd, 'status', 'veth99', env=env)
-        self.assertRegex(output, 'Driver: veth')
-
-        output = check_output(*networkctl_cmd, 'status', 'veth-peer', env=env)
-        self.assertRegex(output, 'Driver: veth')
-
     def test_delete_links(self):
         copy_unit_to_networkd_unit_path('11-dummy.netdev', '11-dummy.network',
                                         '25-veth.netdev', 'netdev-link-local-addressing-yes.network')