From 717840fc09d1e42b1f924af9b9730eb070362d34 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Fri, 23 Sep 2011 22:33:21 +0200 Subject: [PATCH] torture: check for presence of ssh agent --- tests/client/torture_auth.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/client/torture_auth.c b/tests/client/torture_auth.c index 4fbcf581..83bbd406 100644 --- a/tests/client/torture_auth.c +++ b/tests/client/torture_auth.c @@ -25,6 +25,7 @@ #include "libssh/libssh.h" #include "libssh/priv.h" #include "libssh/session.h" +#include "agent.c" static void setup(void **state) { int verbosity = torture_libssh_verbosity(); @@ -288,7 +289,10 @@ static void torture_auth_agent(void **state) { " to enable this test!!\n"); return; } - + if (!agent_is_running(session)){ + print_message("*** Agent not running. Test ignored"); + return; + } rc = ssh_options_set(session, SSH_OPTIONS_USER, user); assert_true(rc == SSH_OK); @@ -316,7 +320,10 @@ static void torture_auth_agent_nonblocking(void **state) { " to enable this test!!\n"); return; } - + if (!agent_is_running(session)){ + print_message("*** Agent not running. Test ignored"); + return; + } rc = ssh_options_set(session, SSH_OPTIONS_USER, user); assert_true(rc == SSH_OK);