diff options
| author |   Lukasz Pawlik <lukaszx.pawlik@intel.com> | 2019-10-18 12:09:06 +0100 |
|---|---|---|
| committer |   Emma Finn <emma.finn@intel.com> | 2019-10-29 11:05:07 +0000 |
| commit | 1228d77f76bd2ed620c2da6035f86720181a87af (patch) | |
| tree | 619fd8fb9337b812a355cef43a55b7a49b7ebc91 | |
| parent | 3f232ae35949a3c85d45b088f38c3d47b3eb90f5 (diff) | |
integration: fix null_pmd tests
In OVS >= 2.12 output from ovs-vsctl got changed. Whitespace matching is
no longer required when searching for devargs. This patch fix regular
expression.
Change-Id: Ic2e6965552a7200647410cd73cd2c60817d31a81
Signed-off-by: Lukasz Pawlik <lukaszx.pawlik@intel.com>
| -rw-r--r-- | conf/integration/01b_dpdk_regression_tests.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/integration/01b_dpdk_regression_tests.conf b/conf/integration/01b_dpdk_regression_tests.conf index 206ef1f8..44343d28 100644 --- a/conf/integration/01b_dpdk_regression_tests.conf +++ b/conf/integration/01b_dpdk_regression_tests.conf @@ -707,7 +707,7 @@ _OVSDPDK_VDEV_ADD_NULL = [ ['vswitch', 'add_switch', 'int_br0'], ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] add-port int_br0 null0 -- ' 'set Interface null0 type=dpdk options:dpdk-devargs=eth_null0'], - ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] show', '|dpdk-devargs=\S+eth_null0'], + ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] show', '|dpdk-devargs=eth_null0'], ['tools', 'assert', 'len(#STEP[-1])==1'], ] @@ -744,7 +744,7 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [ "TestSteps": _OVSDPDK_VDEV_ADD_NULL + [ ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] del-port null0'], ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] show', - '|dpdk-devargs=\S+eth_null0'], + '|dpdk-devargs=eth_null0'], ['tools', 'assert', 'not len(#STEP[-1])'], ] }, |