Also, move a few tests that were really ovsdb-client tests to the new file.
Signed-off-by: Ben Pfaff <[email protected]> --- tests/automake.mk | 1 + tests/ovsdb-client.at | 22 ++++++++++++++++++++++ tests/ovsdb-server.at | 21 --------------------- tests/ovsdb.at | 1 + 4 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 tests/ovsdb-client.at diff --git a/tests/automake.mk b/tests/automake.mk index 156b40f58d7c..3cfc0e9bdccb 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -81,6 +81,7 @@ TESTSUITE_AT = \ tests/ovsdb-tool.at \ tests/ovsdb-replication.at \ tests/ovsdb-server.at \ + tests/ovsdb-client.at \ tests/ovsdb-monitor.at \ tests/ovsdb-idl.at \ tests/ovsdb-lock.at \ diff --git a/tests/ovsdb-client.at b/tests/ovsdb-client.at new file mode 100644 index 000000000000..3bce96b23fc8 --- /dev/null +++ b/tests/ovsdb-client.at @@ -0,0 +1,22 @@ +AT_BANNER([OVSDB -- ovsdb-client commands]) + +AT_SETUP([ovsdb-client get-schema-version]) +AT_KEYWORDS([ovsdb server positive]) +ordinal_schema > schema +AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-client get-schema-version unix:socket ordinals], [0], [5.1.3 +]) +OVSDB_SERVER_SHUTDOWN +AT_CLEANUP + +AT_SETUP([ovsdb-client get-schema-version - tcp socket]) +AT_KEYWORDS([ovsdb server positive tcp]) +ordinal_schema > schema +AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --remote=ptcp:0:127.0.0.1 db], [0], [ignore], [ignore]) +PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) +AT_CHECK([ovsdb-client get-schema-version tcp:127.0.0.1:$TCP_PORT ordinals], [0], [5.1.3 +]) +OVSDB_SERVER_SHUTDOWN +AT_CLEANUP]) diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 1ad49e64139f..795427c5b1e5 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -137,16 +137,6 @@ AT_CHECK([${PERL} $srcdir/uuidfilt.pl output], [0], [test ! -e pid || kill `cat pid`]) AT_CLEANUP -AT_SETUP([ovsdb-client get-schema-version]) -AT_KEYWORDS([ovsdb server positive]) -ordinal_schema > schema -AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-client get-schema-version unix:socket ordinals], [0], [5.1.3 -]) -OVSDB_SERVER_SHUTDOWN -AT_CLEANUP - dnl CHECK_DBS([databases]) dnl dnl Checks that ovsdb-server hosts the given 'databases', each of which @@ -966,17 +956,6 @@ ONE_EXECUTION_EXAMPLE AT_BANNER([OVSDB -- ovsdb-server transactions (TCP IPv4 sockets)]) -AT_SETUP([ovsdb-client get-schema-version - tcp socket]) -AT_KEYWORDS([ovsdb server positive tcp]) -ordinal_schema > schema -AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --remote=ptcp:0:127.0.0.1 db], [0], [ignore], [ignore]) -PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) -AT_CHECK([ovsdb-client get-schema-version tcp:127.0.0.1:$TCP_PORT ordinals], [0], [5.1.3 -]) -OVSDB_SERVER_SHUTDOWN -AT_CLEANUP]) - # OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS]) # # Creates a database with the given SCHEMA, starts an ovsdb-server on diff --git a/tests/ovsdb.at b/tests/ovsdb.at index 8a389b8aad3a..a38abd858272 100644 --- a/tests/ovsdb.at +++ b/tests/ovsdb.at @@ -145,6 +145,7 @@ m4_include([tests/ovsdb-trigger.at]) m4_include([tests/ovsdb-tool.at]) m4_include([tests/ovsdb-replication.at]) m4_include([tests/ovsdb-server.at]) +m4_include([tests/ovsdb-client.at]) m4_include([tests/ovsdb-monitor.at]) m4_include([tests/ovsdb-idl.at]) m4_include([tests/ovsdb-lock.at]) -- 2.10.2 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
