Message ID | 1468338908-10848-4-git-send-email-aserdean@cloudbasesolutions.com |
---|---|
State | Superseded |
Headers | show |
Acked-by: Paul Boca <pboca@cloudbasesolutions.com> > -----Original Message----- > From: dev [mailto:dev-bounces@openvswitch.org] On Behalf Of Alin Serdean > Sent: Tuesday, July 12, 2016 6:55 PM > To: dev@openvswitch.org > Subject: [ovs-dev] [PATCH 3/3] Windows tests: daemon specific tests > > We do not write anything to the file created by the punix/unix arguments. > Switch tests to plain file existence. > > Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> > --- > tests/ovsdb-server.at | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at > index 299e537..13c8e55 100644 > --- a/tests/ovsdb-server.at > +++ b/tests/ovsdb-server.at > @@ -388,7 +388,7 @@ AT_CHECK([ovsdb-server --detach --no-chdir --pidfile > db]) > AT_CHECK([test ! -e socket1]) > AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-remote > punix:socket1]) > if test "$IS_WIN32" = "yes"; then > - OVS_WAIT_UNTIL([test -s socket1]) > + OVS_WAIT_UNTIL([test -e socket1]) > else > OVS_WAIT_UNTIL([test -S socket1]) > fi > @@ -399,7 +399,7 @@ AT_CHECK([ovs-appctl -t ovsdb-server ovsdb- > server/list-remotes], > AT_CHECK([test ! -e socket2]) > AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-remote > punix:socket2]) > if test "$IS_WIN32" = "yes"; then > - OVS_WAIT_UNTIL([test -s socket2]) > + OVS_WAIT_UNTIL([test -e socket2]) > else > OVS_WAIT_UNTIL([test -S socket2]) > fi > @@ -416,7 +416,7 @@ ovs-appctl: ovsdb-server: server returned an error > AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/remove-remote > punix:socket1]) > OVS_WAIT_UNTIL([test ! -e socket1]) > if test "$IS_WIN32" = "yes"; then > - AT_CHECK([test -s socket2]) > + AT_CHECK([test -e socket2]) > else > AT_CHECK([test -S socket2]) > fi > -- > 1.9.5.msysgit.0 > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 299e537..13c8e55 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -388,7 +388,7 @@ AT_CHECK([ovsdb-server --detach --no-chdir --pidfile db]) AT_CHECK([test ! -e socket1]) AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1]) if test "$IS_WIN32" = "yes"; then - OVS_WAIT_UNTIL([test -s socket1]) + OVS_WAIT_UNTIL([test -e socket1]) else OVS_WAIT_UNTIL([test -S socket1]) fi @@ -399,7 +399,7 @@ AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/list-remotes], AT_CHECK([test ! -e socket2]) AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket2]) if test "$IS_WIN32" = "yes"; then - OVS_WAIT_UNTIL([test -s socket2]) + OVS_WAIT_UNTIL([test -e socket2]) else OVS_WAIT_UNTIL([test -S socket2]) fi @@ -416,7 +416,7 @@ ovs-appctl: ovsdb-server: server returned an error AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/remove-remote punix:socket1]) OVS_WAIT_UNTIL([test ! -e socket1]) if test "$IS_WIN32" = "yes"; then - AT_CHECK([test -s socket2]) + AT_CHECK([test -e socket2]) else AT_CHECK([test -S socket2]) fi
We do not write anything to the file created by the punix/unix arguments. Switch tests to plain file existence. Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> --- tests/ovsdb-server.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)