| Message ID | 1464696587-16652-1-git-send-email-pboca@cloudbasesolutions.com |
|---|---|
| State | Not Applicable |
| Headers | show |
Ignore this one, I will send a V2. > -----Original Message----- > From: dev [mailto:dev-bounces@openvswitch.org] On Behalf Of Paul Boca > Sent: Tuesday, May 31, 2016 3:10 PM > To: dev@openvswitch.org > Subject: [ovs-dev] [PATCH 1/2] tests: Fix fail of OVS_APP_EXIT_AND_WAIT over > `pwd`/unixctl > > Reverted back some calls to OVS_APP_EXIT_AND_WAIT. > This maro expects the name of the service, not a socket. > > Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> > --- > tests/daemon.at | 2 +- > tests/ovs-vswitchd.at | 6 +++--- > tests/ovsdb-monitor.at | 2 +- > tests/ovsdb-server.at | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/daemon.at b/tests/daemon.at > index 41c5d07..51d56c5 100644 > --- a/tests/daemon.at > +++ b/tests/daemon.at > @@ -83,7 +83,7 @@ if test "$IS_WIN32" = "yes"; then > # When a 'kill pid' is done on windows (through 'taskkill //F'), > # pidfiles are not deleted (because it is force kill), so use > # 'ovs-appctl exit' instead > - OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) > + ovs-appctl -t `pwd`/unixctl exit > else > kill `cat pid` > fi > diff --git a/tests/ovs-vswitchd.at b/tests/ovs-vswitchd.at > index 816d0a2..b487099 100644 > --- a/tests/ovs-vswitchd.at > +++ b/tests/ovs-vswitchd.at > @@ -76,7 +76,7 @@ ovs-vswitchd --log-file=fakelog --unixctl="`pwd`"/unixctl & > sleep 5 > > # stop the process. > -OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) > +ovs-appctl -t `pwd`/unixctl exit > > # check the fakelog, should only see one ERR for reporting > # the existing ovs-vswitchd process. > @@ -112,7 +112,7 @@ bridge br0: using datapath ID > ]) > > # stop the process. > -OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) > +ovs-appctl -t `pwd`/unixctl exit > > # check the fakelog, should not see WARN/ERR/EMER log other than the one > # for reporting the existing ovs-vswitchd process and the one for killing > @@ -138,7 +138,7 @@ ovs-vswitchd unix:invalid.db.sock --log-file=fakelog -- > enable-dummy --unixctl="` > sleep 10 > > # stop the process. > -OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) > +ovs-appctl -t `pwd`/unixctl exit > > # should not see this log (which indicates high cpu utilization). > AT_CHECK([grep "wakeup due to" fakelog], [ignore]) > diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at > index 37383fa..018172a 100644 > --- a/tests/ovsdb-monitor.at > +++ b/tests/ovsdb-monitor.at > @@ -39,7 +39,7 @@ m4_define([OVSDB_CHECK_MONITOR], > [ignore], [ignore], [kill `cat server-pid client-pid`])]) > AT_CHECK([ovsdb-client transact unix:socket '[["$4"]]'], [0], > [ignore], [ignore], [kill `cat server-pid client-pid`]) > - OVS_APP_EXIT_AND_WAIT(["`pwd`"/unixctl]) > + ovs-appctl -t `pwd`/unixctl exit > OVS_WAIT_UNTIL([test ! -e client-pid]) > AT_CHECK([${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} > $srcdir/uuidfilt.pl], [0], [$7], [ignore]) > AT_CLEANUP]) > diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at > index 0ed7e87..d84db23 100644 > --- a/tests/ovsdb-server.at > +++ b/tests/ovsdb-server.at > @@ -1,7 +1,7 @@ > AT_BANNER([OVSDB -- ovsdb-server transactions (Unix sockets)]) > > m4_define([OVSDB_SERVER_SHUTDOWN], > - [OVS_APP_EXIT_AND_WAIT(["`pwd`"/unixctl])]) > + [ovs-appctl -t `pwd`/unixctl exit]) > > # OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, > [KEYWORDS]) > # > @@ -34,7 +34,7 @@ cat stdout >> output > AT_CLEANUP]) > > EXECUTION_EXAMPLES > - > + > AT_BANNER([ovsdb-server miscellaneous features]) > > AT_SETUP([truncating corrupted database log]) > -- > 2.7.2.windows.1 > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
diff --git a/tests/daemon.at b/tests/daemon.at index 41c5d07..51d56c5 100644 --- a/tests/daemon.at +++ b/tests/daemon.at @@ -83,7 +83,7 @@ if test "$IS_WIN32" = "yes"; then # When a 'kill pid' is done on windows (through 'taskkill //F'), # pidfiles are not deleted (because it is force kill), so use # 'ovs-appctl exit' instead - OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) + ovs-appctl -t `pwd`/unixctl exit else kill `cat pid` fi diff --git a/tests/ovs-vswitchd.at b/tests/ovs-vswitchd.at index 816d0a2..b487099 100644 --- a/tests/ovs-vswitchd.at +++ b/tests/ovs-vswitchd.at @@ -76,7 +76,7 @@ ovs-vswitchd --log-file=fakelog --unixctl="`pwd`"/unixctl & sleep 5 # stop the process. -OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) +ovs-appctl -t `pwd`/unixctl exit # check the fakelog, should only see one ERR for reporting # the existing ovs-vswitchd process. @@ -112,7 +112,7 @@ bridge br0: using datapath ID ]) # stop the process. -OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) +ovs-appctl -t `pwd`/unixctl exit # check the fakelog, should not see WARN/ERR/EMER log other than the one # for reporting the existing ovs-vswitchd process and the one for killing @@ -138,7 +138,7 @@ ovs-vswitchd unix:invalid.db.sock --log-file=fakelog --enable-dummy --unixctl="` sleep 10 # stop the process. -OVS_APP_EXIT_AND_WAIT([`pwd`/unixctl]) +ovs-appctl -t `pwd`/unixctl exit # should not see this log (which indicates high cpu utilization). AT_CHECK([grep "wakeup due to" fakelog], [ignore]) diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index 37383fa..018172a 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -39,7 +39,7 @@ m4_define([OVSDB_CHECK_MONITOR], [ignore], [ignore], [kill `cat server-pid client-pid`])]) AT_CHECK([ovsdb-client transact unix:socket '[["$4"]]'], [0], [ignore], [ignore], [kill `cat server-pid client-pid`]) - OVS_APP_EXIT_AND_WAIT(["`pwd`"/unixctl]) + ovs-appctl -t `pwd`/unixctl exit OVS_WAIT_UNTIL([test ! -e client-pid]) AT_CHECK([${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl], [0], [$7], [ignore]) AT_CLEANUP]) diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 0ed7e87..d84db23 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -1,7 +1,7 @@ AT_BANNER([OVSDB -- ovsdb-server transactions (Unix sockets)]) m4_define([OVSDB_SERVER_SHUTDOWN], - [OVS_APP_EXIT_AND_WAIT(["`pwd`"/unixctl])]) + [ovs-appctl -t `pwd`/unixctl exit]) # OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS]) # @@ -34,7 +34,7 @@ cat stdout >> output AT_CLEANUP]) EXECUTION_EXAMPLES - + AT_BANNER([ovsdb-server miscellaneous features]) AT_SETUP([truncating corrupted database log])
Reverted back some calls to OVS_APP_EXIT_AND_WAIT. This maro expects the name of the service, not a socket. Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> --- tests/daemon.at | 2 +- tests/ovs-vswitchd.at | 6 +++--- tests/ovsdb-monitor.at | 2 +- tests/ovsdb-server.at | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)