diff options
| author | Alin Serdean <aserdean@cloudbasesolutions.com> | 2017-01-26 18:32:56 +0000 |
|---|---|---|
| committer | Gurucharan Shetty <guru@ovn.org> | 2017-01-27 14:14:27 -0800 |
| commit | 13574ee6c094a31f1cc9abf84ba688ff441dac5c (patch) | |
| tree | b6cdedf517689c43ccac489845965d41640b11e9 | |
| parent | 1c26fa64e0f6f8732bdccb2a24bfe8a9140ee03a (diff) | |
| download | openvswitch-13574ee6c094a31f1cc9abf84ba688ff441dac5c.tar.gz | |
tests windows: change service test
Skip the test if the service 'ovsdb-server' is already defined.
The arguments of the service are incomplete: in the former state
it will try to create the pidfile and unixctl in the configuration path.
This patch adds those arguments.
Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
| -rw-r--r-- | tests/daemon.at | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/daemon.at b/tests/daemon.at index 454de37ce..952d5a7c7 100644 --- a/tests/daemon.at +++ b/tests/daemon.at @@ -168,13 +168,14 @@ AT_SETUP([daemon --service]) AT_KEYWORDS([windows-service]) AT_SKIP_IF([test "$IS_WIN32" != "yes"]) OVS_SKIP_NON_ADMIN_WIN +AT_SKIP_IF([sc qc ovsdb-server]) OVSDB_INIT([db]) AT_CAPTURE_FILE([pid]) # To create a Windows service, we need the absolute path for the executable. abs_path="$(cd $(dirname `which ovsdb-server`); pwd -W; cd $OLDPWD)" -AT_CHECK([sc create ovsdb-server binpath="$abs_path/ovsdb-server `pwd`/db --log-file=`pwd`/ovsdb-server.log --pidfile --remote=punix:`pwd`/socket --service"], +AT_CHECK([sc create ovsdb-server binpath="$abs_path/ovsdb-server `pwd`/db --log-file=`pwd`/ovsdb-server.log --pidfile=`pwd`/ovsdb-server.pid --unixctl=`pwd`/ovsdb-server.ctl --remote=punix:`pwd`/socket --service"], [0], [[[SC]] CreateService SUCCESS ]) |