[ovs-dev] [PATCH V2] tests: Skip "daemon --service" test on Windows from non-admin console

Paul Boca pboca at cloudbasesolutions.com
Tue Jun 7 08:12:16 UTC 2016


Check if we have enough rights to create a service on Windows
otherwise we skip daemon test

Signed-off-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>
Tested-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>
---
V2: renamed macro from OVS_SKIP_NON_ADMIN to OVS_SKIP_NON_ADMIN_WIN
---
 tests/daemon.at | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/daemon.at b/tests/daemon.at
index 41c5d07..962169a 100644
--- a/tests/daemon.at
+++ b/tests/daemon.at
@@ -2,6 +2,15 @@ AT_BANNER([daemon unit tests - C])
 
 AT_SETUP([daemon])
 AT_SKIP_IF([test "$IS_WIN32" = "yes"])
+
+dnl OVS_SKIP_NON_ADMIN_WIN()
+dnl
+dnl Checks if we have enough rights to create a service
+m4_define([OVS_SKIP_NON_ADMIN_WIN],
+  [
+   AT_SKIP_IF([net session; test $? -ne 0])
+   ])
+
 OVSDB_INIT([db])
 AT_CAPTURE_FILE([pid])
 AT_CAPTURE_FILE([expected])
@@ -163,6 +172,8 @@ AT_CLEANUP
 AT_SETUP([daemon --service])
 AT_KEYWORDS([windows-service])
 AT_SKIP_IF([test "$IS_WIN32" != "yes"])
+OVS_SKIP_NON_ADMIN_WIN
+
 OVSDB_INIT([db])
 AT_CAPTURE_FILE([pid])
 # To create a Windows service, we need the absolute path for the executable.
-- 
2.7.2.windows.1



More information about the dev mailing list