| Message ID | 20190917213000.13146-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Commit | c73d632a4bd2009a6cd4562d6de41d310b825b46 |
| Headers | show |
| Series | [ovs-dev] tests: Fix ovs-vsctl unit test failure regression. | expand |
On Tue, Sep 17, 2019 at 04:34:37PM -0700, Justin Pettit wrote: > > > On Sep 17, 2019, at 2:30 PM, Ben Pfaff <blp@ovn.org> wrote: > > > > This worked fine as long as there was only one table whose name started > > with "C", but now we have three of them. > > > > CC: Justin Pettit <jpettit@ovn.org> > > Fixes: 61a5264d60d0 ("ovs-vswitchd: Add Datapath, CT_Zone, and CT_Zone_Policy tables.") > > Signed-off-by: Ben Pfaff <blp@ovn.org> > > Acked-by: Justin Pettit <jpettit@ovn.org> Thanks, applied to master.
> On Sep 17, 2019, at 2:30 PM, Ben Pfaff <blp@ovn.org> wrote: > > This worked fine as long as there was only one table whose name started > with "C", but now we have three of them. > > CC: Justin Pettit <jpettit@ovn.org> > Fixes: 61a5264d60d0 ("ovs-vswitchd: Add Datapath, CT_Zone, and CT_Zone_Policy tables.") > Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Justin Pettit <jpettit@ovn.org> Thanks! --Justin
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 46fa3c5b1a33..4907be35d342 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -890,10 +890,10 @@ AT_CHECK([RUN_OVS_VSCTL([set bridge br0 flood_vlans=-1])], AT_CHECK([RUN_OVS_VSCTL([set bridge br0 flood_vlans=4096])], [1], [], [ovs-vsctl: constraint violation: 4096 is not in the valid range 0 to 4095 (inclusive) ]) -AT_CHECK([RUN_OVS_VSCTL([set c br1 'connection-mode=xyz'])], +AT_CHECK([RUN_OVS_VSCTL([set co br1 'connection-mode=xyz'])], [1], [], [[ovs-vsctl: constraint violation: xyz is not one of the allowed values ([in-band, out-of-band]) ]]) -AT_CHECK([RUN_OVS_VSCTL([set c br1 connection-mode:x=y])], +AT_CHECK([RUN_OVS_VSCTL([set co br1 connection-mode:x=y])], [1], [], [ovs-vsctl: cannot specify key to set for non-map column connection_mode ]) AT_CHECK([RUN_OVS_VSCTL([add bridge br1 datapath_id x y])],
This worked fine as long as there was only one table whose name started with "C", but now we have three of them. CC: Justin Pettit <jpettit@ovn.org> Fixes: 61a5264d60d0 ("ovs-vswitchd: Add Datapath, CT_Zone, and CT_Zone_Policy tables.") Signed-off-by: Ben Pfaff <blp@ovn.org> --- tests/ovs-vsctl.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)