From e794a6150cdb3d6298685dcd3c8cb12ffe06aa24 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Wed, 16 Feb 2022 22:55:40 +0100 Subject: [PATCH] Add more unit tests --- bin/junest | 2 +- lib/checks/check_all.sh | 1 + tests/unit-tests/test-junest.sh | 143 +++++++++++++++++--------------- 3 files changed, 79 insertions(+), 67 deletions(-) diff --git a/bin/junest b/bin/junest index 22540fb..c09f339 100755 --- a/bin/junest +++ b/bin/junest @@ -69,7 +69,7 @@ usage() { echo -e " -n, --disable-check Disable the $NAME image check" echo echo -e " create-bin-wrappers Create bin wrappers in $JUNEST_HOME/usr/bin_wrappers" - echo -e " -f, --force Replace the wrapper files even if they already exist" + echo -e " -f, --force Create the wrapper files even if they already exist" echo } diff --git a/lib/checks/check_all.sh b/lib/checks/check_all.sh index c975542..210ebfb 100755 --- a/lib/checks/check_all.sh +++ b/lib/checks/check_all.sh @@ -22,4 +22,5 @@ $JUNEST_SCRIPT ns --backend-command "$JUNEST_HOME/usr/bin/bwrap" -- exit sudo -E $JUNEST_SCRIPT groot -- "$CHECK_SCRIPT" --run-root-tests --skip-aur-tests # Test the wrappers work +$JUNEST_SCRIPT create-bin-wrappers --force $JUNEST_HOME/usr/bin_wrappers/pacman --help diff --git a/tests/unit-tests/test-junest.sh b/tests/unit-tests/test-junest.sh index 0ba7cf5..123b4bd 100755 --- a/tests/unit-tests/test-junest.sh +++ b/tests/unit-tests/test-junest.sh @@ -12,75 +12,74 @@ function oneTimeSetUp(){ } function setUp(){ + ## Mock functions ## + function usage(){ + echo "usage" + } + function version(){ + echo "version" + } + function build_image_env(){ + local disable_check=$1 + echo "build_image_env($disable_check)" + } + function delete_env(){ + echo "delete_env" + } + function setup_env_from_file(){ + echo "setup_env_from_file($1)" + } + function setup_env(){ + echo "setup_env($1)" + } + function run_env_as_proot_fakeroot(){ + local backend_command="$1" + local backend_args="$2" + local no_copy_files="$3" + shift 3 + echo "run_env_as_proot_fakeroot($backend_command,$backend_args,$no_copy_files,$@)" + } + function run_env_as_groot(){ + local backend_command="$1" + local backend_args="$2" + local no_copy_files="$3" + shift 3 + echo "run_env_as_groot($backend_command,$backend_args,$no_copy_files,$@)" + } + function run_env_as_chroot(){ + local backend_command="$1" + local backend_args="$2" + local no_copy_files="$3" + shift 3 + echo "run_env_as_chroot($backend_command,$backend_args,$no_copy_files,$@)" + } + function run_env_as_proot_user(){ + local backend_command="$1" + local backend_args="$2" + local no_copy_files="$3" + shift 3 + echo "run_env_as_proot_user($backend_command,$backend_args,$no_copy_files,$@)" + } + function run_env_as_bwrap_fakeroot(){ + local backend_command="$1" + local backend_args="$2" + local no_copy_files="$3" + shift 3 + echo "run_env_as_bwrap_fakeroot($backend_command,$backend_args,$no_copy_files,$@)" + } + function run_env_as_bwrap_user(){ + local backend_command="$1" + local backend_args="$2" + local no_copy_files="$3" + shift 3 + echo "run_env_as_bwrap_user($backend_command,$backend_args,$no_copy_files,$@)" + } function is_env_installed(){ return 0 } -} - -## Mock functions ## -function usage(){ - echo "usage" -} -function version(){ - echo "version" -} -function build_image_env(){ - local disable_check=$1 - echo "build_image_env($disable_check)" -} -function delete_env(){ - echo "delete_env" -} -function create_wrappers(){ - : -} -function setup_env_from_file(){ - echo "setup_env_from_file($1)" -} -function setup_env(){ - echo "setup_env($1)" -} -function run_env_as_proot_fakeroot(){ - local backend_command="$1" - local backend_args="$2" - local no_copy_files="$3" - shift 3 - echo "run_env_as_proot_fakeroot($backend_command,$backend_args,$no_copy_files,$@)" -} -function run_env_as_groot(){ - local backend_command="$1" - local backend_args="$2" - local no_copy_files="$3" - shift 3 - echo "run_env_as_groot($backend_command,$backend_args,$no_copy_files,$@)" -} -function run_env_as_chroot(){ - local backend_command="$1" - local backend_args="$2" - local no_copy_files="$3" - shift 3 - echo "run_env_as_chroot($backend_command,$backend_args,$no_copy_files,$@)" -} -function run_env_as_proot_user(){ - local backend_command="$1" - local backend_args="$2" - local no_copy_files="$3" - shift 3 - echo "run_env_as_proot_user($backend_command,$backend_args,$no_copy_files,$@)" -} -function run_env_as_bwrap_fakeroot(){ - local backend_command="$1" - local backend_args="$2" - local no_copy_files="$3" - shift 3 - echo "run_env_as_bwrap_fakeroot($backend_command,$backend_args,$no_copy_files,$@)" -} -function run_env_as_bwrap_user(){ - local backend_command="$1" - local backend_args="$2" - local no_copy_files="$3" - shift 3 - echo "run_env_as_bwrap_user($backend_command,$backend_args,$no_copy_files,$@)" + function create_wrappers(){ + : + } } function test_help(){ @@ -106,6 +105,18 @@ function test_build_image_env(){ assertEquals "build_image_env(true)" "$(cat $STDOUTF)" } +function test_create_wrappers(){ + function create_wrappers(){ + local force=$1 + echo "create_wrappers($force)" + } + assertCommandSuccess main create-bin-wrappers + assertEquals "create_wrappers(false)" "$(cat $STDOUTF)" + + assertCommandSuccess main create-bin-wrappers --force + assertEquals "create_wrappers(true)" "$(cat $STDOUTF)" +} + function test_delete_env(){ assertCommandSuccess main s -d assertEquals "delete_env" "$(cat $STDOUTF)"