diff options
author | xu,huilong <huilongx.xu@intel.com> | 2016-12-14 17:07:25 +0800 |
---|---|---|
committer | Marvin Liu <yong.liu@intel.com> | 2016-12-14 23:10:47 +0800 |
commit | 4cae564322ca904da0125d800dc9ccf6b9ec94b9 (patch) | |
tree | 9774da7b49cc508ff4c4fc95ae87f786bfc087cb | |
parent | a9edb8c439b41675c63f9a9ff0f7e80a5276c47d (diff) |
test kni: fix ping6 and stress case issue on Fedora25
Ping output and kernel output are different between FC25 and other OSs.
Modified those cases which affected by the change.
Signed-off-by: xu,huilong <huilongx.xu@intel.com>
-rw-r--r-- | tests/TestSuite_kni.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py index 18bd768..3836c57 100644 --- a/tests/TestSuite_kni.py +++ b/tests/TestSuite_kni.py @@ -574,12 +574,14 @@ class TestKni(TestCase): out = self.dut.send_expect("ping6 -w 1 -I %s %s" % (virtual_interface, str(ipv6_address)), "# ", 10) - self.verify("64 bytes from %s: icmp_seq=1 ttl=64" % + # FC25 ping6 output info is "64 bytes from ipv6_address%v: icmp_seq=1 ttl=64" + # other os ping6 output is "64 bytes from ipv6_address: icmp_seq=1 ttl=64" + self.verify("64 bytes from %s" % ipv6_address in out, "ping6 not supported") out = self.tester.send_expect( "ping6 -w 1 -I %s %s" % (tx_interface, str(ipv6_address)), "# ", 10) - self.verify("64 bytes from %s: icmp_seq=1 ttl=64" % + self.verify("64 bytes from %s" % ipv6_address in out, "kni cannot reply ping6 packet") ipv6list = list(ipv6_address) @@ -806,14 +808,14 @@ class TestKni(TestCase): try: out = self.start_kni(step['lo_mode'], step['kthread_mode']) self.verify("Error" not in out, "Error found during kni start") + # kni setup out info by kernel debug function. so should re-build kenel. + # now not check kni setup out info, only check kni setup ok and setup no error output + out = self.dut.send_expect('ps -aux', "]# ") + self.verify("kni" not in out, "kni process setup failed") except: # some permutations have to fail pass - out = self.dut.send_expect('dmesg -c | grep "KNI"', "]# ") - self.verify(len(re.findall(expectedMessage, out, re.DOTALL)) > 0, - "Module not properly loaded") - def test_perf_loopback(self): """ KNI loopback performance |