Re: [ovs-dev] [PATCH] tests windows: change service test

[Guru Shetty]

On 26 January 2017 at 10:32, Alin Serdean 
wrote:

> 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 
> ---
> Intended for master and branch-2.7
>
Applied.

> ---
>  tests/daemon.at | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/daemon.at b/tests/daemon.at
> index 454de37..952d5a7 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
>  ])
>
> --
> 2.10.2.windows.1
> ___
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

[ovs-dev] [PATCH] tests windows: change service test

[Alin Serdean]

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 
---
Intended for master and branch-2.7
---
 tests/daemon.at | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/daemon.at b/tests/daemon.at
index 454de37..952d5a7 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
 ])
 
-- 
2.10.2.windows.1
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev