Commit 04d51ba0 authored by Konrad Sztyber's avatar Konrad Sztyber
Browse files

test/keyring: ensure session keyring is available 



The keyring_linux tests require the session keyring to be available.
Usually, it's created on login and destroyed on logout, so it is always
available, but it's possible to revoke it (keyctl revoke @s), causing
the tests to fail.

So, to avoid relying on system configuration, always run these tests
under a new session.

Fixes: #3492

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Ie30ef624f6f14a634beb7d8a49b1e3e3e334e92f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24774


Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 1f2536e2

autotest.sh

+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
			# The keyring tests utilize NVMe/TLS

			run_test "keyring_file" "$rootdir/test/keyring/file.sh"

			if [[ "$CONFIG_HAVE_KEYUTILS" == y ]]; then

				run_test "keyring_linux" "$rootdir/test/keyring/linux.sh"

				run_test "keyring_linux" "$rootdir/scripts/keyctl-session-wrapper" \

					"$rootdir/test/keyring/linux.sh"

			fi

		elif [ "$SPDK_TEST_NVMF_TRANSPORT" = "fc" ]; then

			run_test "nvmf_fc" $rootdir/test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT

scripts/keyctl-session-wrapper

0 → 100755
+5 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash

# SPDX-License-Identifier: BSD-3-Clause

# Copyright (c) 2024 Intel Corporation



keyctl session - "$@"