From 370a11b90339cd26a64d29d5320a5f864330be02 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 21 Oct 2010 11:28:00 -0700 Subject: [PATCH] tests: Update expected test result to match "ovsdb-client dump" changes. Commit 06036898849 "ovsdb-client: Make "dump" print table names in default output format too" changed the output format of "ovsdb-client dump" without updating the tests that depended on that output format. This commit updates the expected test results to match. --- tests/ovsdb-server.at | 15 +++++++++------ tests/ovsdb-tool.at | 30 ++++++++++++++++++------------ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 6902fc47..52c19692 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -204,8 +204,9 @@ AT_CHECK([[perl $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/ dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-client dump unix:socket ordinals]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -226,8 +227,9 @@ AT_CHECK([wc -l < db], [0], [4 dnl And check that the dumped data is the same too: AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -251,8 +253,9 @@ AT_CHECK([wc -l < db], [0], [6 dnl Then check that the dumped data is correct. AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at index 12ff0495..7f09d349 100644 --- a/tests/ovsdb-tool.at +++ b/tests/ovsdb-tool.at @@ -106,8 +106,9 @@ AT_CHECK([[perl $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/ dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -128,8 +129,9 @@ AT_CHECK([wc -l < db], [0], [4 dnl And check that the dumped data is the same too: AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -169,8 +171,9 @@ AT_CHECK( dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -191,8 +194,9 @@ AT_CHECK([wc -l < db], [0], [4 dnl And check that the dumped data is the same except for the removed column: AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid number ------------------------------------ ------ <0> 0 @&t@ <1> 1 @&t@ @@ -231,8 +235,9 @@ AT_CHECK( dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid number ------------------------------------ ------ <0> 0 @&t@ <1> 1 @&t@ @@ -253,8 +258,9 @@ AT_CHECK([wc -l < db], [0], [4 dnl And check that the dumped data is the same except for the added column: AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ---- ------ <0> "" 0 @&t@ <1> "" 1 @&t@ -- 2.30.2