From f10d80047c660e33f5c365bf3cf436a0c2a300f1 Mon Sep 17 00:00:00 2001

From: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>

Date: Tue, 23 Jun 2020 18:31:47 +0200

Subject: [PATCH] tests: Do not parse configuration file in torture_knownhosts

The test might fail if there is a local configuration file that changes

the location of the known_hosts file.  The test should not be affected

by configuration files present in the testing environment.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>

Reviewed-by: Jakub Jelen <jjelen@redhat.com>

---

 tests/client/torture_knownhosts.c | 8 ++++++++

 1 file changed, 8 insertions(+)

diff --git a/tests/client/torture_knownhosts.c b/tests/client/torture_knownhosts.c

index fcc54846..55aee217 100644

--- a/tests/client/torture_knownhosts.c

+++ b/tests/client/torture_knownhosts.c

@@ -307,6 +307,7 @@ static void torture_knownhosts_other_auto(void **state) {

     char tmp_file[1024] = {0};

     char *known_hosts_file = NULL;

     int rc;

+    bool process_config = false;

     snprintf(tmp_file,

              sizeof(tmp_file),

@@ -344,6 +345,9 @@ static void torture_knownhosts_other_auto(void **state) {

     s->ssh.session = session;

+    rc = ssh_options_set(session, SSH_OPTIONS_PROCESS_CONFIG, &process_config);

+    assert_ssh_return_code(session, rc);

+

     rc = ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);

     assert_ssh_return_code(session, rc);

@@ -368,6 +372,7 @@ static void torture_knownhosts_conflict(void **state) {

     char *known_hosts_file = NULL;

     FILE *file;

     int rc;

+    bool process_config = false;

     snprintf(tmp_file,

              sizeof(tmp_file),

@@ -411,6 +416,9 @@ static void torture_knownhosts_conflict(void **state) {

     s->ssh.session = session;

+    rc = ssh_options_set(session, SSH_OPTIONS_PROCESS_CONFIG, &process_config);

+    assert_ssh_return_code(session, rc);

+

     ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);

     ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);

     rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "rsa-sha2-256");

-- 

2.26.2