From b1681a72edf1941cd1833cf35af6e66523a10968 Mon Sep 17 00:00:00 2001 From: Marcus Burghardt Date: Wed, 23 Nov 2022 11:46:25 +0100 Subject: [PATCH] Ensure pwquality.conf.d dir exists on test scenarios Fixes: #9774 --- .../tests/conflicting_values_directory.fail.sh | 5 +++-- .../accounts_password/tests/correct_value_directory.pass.sh | 5 +++-- .../accounts_password/tests/multiple_correct_value.pass.sh | 5 +++-- .../accounts_password/tests/wrong_value_directory.fail.sh | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh b/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh index e4c31763949..280f8fdf148 100644 --- a/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh +++ b/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh @@ -7,5 +7,6 @@ truncate -s 0 /etc/security/pwquality.conf echo "{{{ VARIABLE }}} = {{{ TEST_CORRECT_VALUE }}}" >> /etc/security/pwquality.conf -echo "{{{ VARIABLE }}} = {{{ TEST_WRONG_VALUE }}}" \ ->> /etc/security/pwquality.conf.d/test_file.conf +config_dir="/etc/security/pwquality.conf.d" +mkdir -p $config_dir +echo "{{{ VARIABLE }}} = {{{ TEST_WRONG_VALUE }}}" >> $config_dir/test_file.conf diff --git a/shared/templates/accounts_password/tests/correct_value_directory.pass.sh b/shared/templates/accounts_password/tests/correct_value_directory.pass.sh index 4fa7dddde5a..1d12e365537 100644 --- a/shared/templates/accounts_password/tests/correct_value_directory.pass.sh +++ b/shared/templates/accounts_password/tests/correct_value_directory.pass.sh @@ -8,5 +8,6 @@ truncate -s 0 /etc/security/pwquality.conf -echo "{{{ VARIABLE }}} = {{{ TEST_CORRECT_VALUE }}}" \ ->> /etc/security/pwquality.conf.d/test_file.conf +config_dir="/etc/security/pwquality.conf.d" +mkdir -p $config_dir +echo "{{{ VARIABLE }}} = {{{ TEST_CORRECT_VALUE }}}" >> $config_dir/test_file.conf diff --git a/shared/templates/accounts_password/tests/multiple_correct_value.pass.sh b/shared/templates/accounts_password/tests/multiple_correct_value.pass.sh index e751143ddc3..ee5f88b4886 100644 --- a/shared/templates/accounts_password/tests/multiple_correct_value.pass.sh +++ b/shared/templates/accounts_password/tests/multiple_correct_value.pass.sh @@ -7,5 +7,6 @@ truncate -s 0 /etc/security/pwquality.conf echo "{{{ VARIABLE }}} = {{{ TEST_CORRECT_VALUE }}}" >> /etc/security/pwquality.conf -echo "{{{ VARIABLE }}} = {{{ TEST_CORRECT_VALUE }}}" \ ->> /etc/security/pwquality.conf.d/test_file.conf +config_dir="/etc/security/pwquality.conf.d" +mkdir -p $config_dir +echo "{{{ VARIABLE }}} = {{{ TEST_CORRECT_VALUE }}}" >> $config_dir/test_file.conf diff --git a/shared/templates/accounts_password/tests/wrong_value_directory.fail.sh b/shared/templates/accounts_password/tests/wrong_value_directory.fail.sh index 98d01f1c25c..8673da1a005 100644 --- a/shared/templates/accounts_password/tests/wrong_value_directory.fail.sh +++ b/shared/templates/accounts_password/tests/wrong_value_directory.fail.sh @@ -7,5 +7,6 @@ truncate -s 0 /etc/security/pwquality.conf -echo "{{{ VARIABLE }}} = {{{ TEST_WRONG_VALUE }}}" \ ->> /etc/security/pwquality.conf.d/test_file.conf +config_dir="/etc/security/pwquality.conf.d" +mkdir -p $config_dir +echo "{{{ VARIABLE }}} = {{{ TEST_WRONG_VALUE }}}" >> $config_dir/test_file.conf