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.

diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index 6902fc470ed8e3818bfb087ec3415dbc5541c2cc..52c196922b9e0cc8ec14b12f38ea35ae47609426 100644 (file)
--- 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])
 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@
 ------------------------------------ ----- ------
 <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`])
 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@
 ------------------------------------ ----- ------
 <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`])
 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@
 ------------------------------------ ----- ------
 <0> five  5     @&t@
 <1> four  4     @&t@

diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at
index 12ff04958beb549f424780ff9e43b471716cc9b1..7f09d3494ed4a4d29eb8167a03092822a6c00e9a 100644 (file)
--- 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])
 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@
 ------------------------------------ ----- ------
 <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])
 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@
 ------------------------------------ ----- ------
 <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])
 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@
 ------------------------------------ ----- ------
 <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])
 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@
 ------------------------------------ ------
 <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])
 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@
 ------------------------------------ ------
 <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])
 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@
 ------------------------------------ ---- ------
 <0> ""   0     @&t@
 <1> ""   1     @&t@