From 7156ac81e0388df0b8a434047e388e1104593355 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Mon, 29 Jan 2024 14:47:34 -0700
Subject: [PATCH] adjust test socket close down and pull of zephyr sdk

---
 .github/workflows/zephyr.yml     | 6 +++---
 tests/api.c                      | 5 +++++
 zephyr/samples/tests/sample.yaml | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
index 40649231d..1221e120d 100644
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -66,10 +66,10 @@ jobs:
 
       - name: Install zephyr SDK
         run: |
-          wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{ matrix.config.zephyr-sdk }}/zephyr-sdk-${{ matrix.config.zephyr-sdk }}_linux-x86_64.tar.xz
-          tar xf zephyr-sdk-${{ matrix.config.zephyr-sdk }}_linux-x86_64.tar.xz
+          wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{ matrix.config.zephyr-sdk }}/zephyr-sdk-${{ matrix.config.zephyr-sdk }}_linux-x86_64_minimal.tar.xz
+          tar xf zephyr-sdk-${{ matrix.config.zephyr-sdk }}_linux-x86_64_minimal.tar.xz
           cd zephyr-sdk-${{ matrix.config.zephyr-sdk }}
-          ./setup.sh -h -c
+          ./setup.sh -h -c -t x86_64-zephyr-elf
 
       - name: Run wolfssh tests
         id: wolfssh-test
diff --git a/tests/api.c b/tests/api.c
index b7f26063a..5ef8010aa 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -953,6 +953,7 @@ static void test_wolfSSH_SFTP_SendReadPacket(void)
     func_args ser;
     tcp_ready ready;
     int argsCount;
+    int clientFd;
 
     const char* args[10];
     WOLFSSH_CTX* ctx = NULL;
@@ -1061,6 +1062,10 @@ static void test_wolfSSH_SFTP_SendReadPacket(void)
 
     AssertIntEQ(argsCount, WS_SUCCESS);
 
+    /* close client socket down */
+    clientFd = wolfSSH_get_fd(ssh);
+    close(clientFd);
+
     wolfSSH_free(ssh);
     wolfSSH_CTX_free(ctx);
 #ifdef WOLFSSH_ZEPHYR
diff --git a/zephyr/samples/tests/sample.yaml b/zephyr/samples/tests/sample.yaml
index f216d6345..4f6f359cf 100644
--- a/zephyr/samples/tests/sample.yaml
+++ b/zephyr/samples/tests/sample.yaml
@@ -9,7 +9,7 @@ common:
       - "Zephyr wolfSSH tests passed"
 tests:
   sample.lib.wolfssh_tests:
-    timeout: 50
+    timeout: 200
     platform_allow: qemu_x86
     integration_platforms:
       - qemu_x86