Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Nmishin committed Jan 10, 2024
1 parent c54c7a4 commit 63087aa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion test/test_install_and_use.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ tests__kv=(
"$(tofuenv list-remote | grep 'beta' | head -n 1),latest:beta"
"$(tofuenv list-remote | grep 'rc' | head -n 1),latest:rc"
"$(tofuenv list-remote | grep '^1\.6\.' | head -n 1),latest:^1.6."
'1.6.0-rc1,latest:^1\.6'
'1.6.0,latest:^1\.6'
'1.6.0-alpha5'
'1.6.0-rc1,v1.6.0-rc1'
);
Expand Down
10 changes: 5 additions & 5 deletions test/test_use_latestallowed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ cleanup || log 'error' 'Cleanup failed?!';
log 'info' '### Install latest-allowed normal version (#.#.#)';

echo "terraform {
required_version = \"~> 1.6.0-rc1\"
required_version = \"~> 1.6.0\"
}" > latest_allowed.tf;

(
tofuenv install latest-allowed;
tofuenv use latest-allowed;
check_active_version 1.6.0-rc1;
check_active_version 1.6.0;
) || error_and_proceed 'Latest allowed version does not match';

cleanup || log 'error' 'Cleanup failed?!';
Expand Down Expand Up @@ -92,7 +92,7 @@ echo "terraform {
(
tofuenv install latest-allowed;
tofuenv use latest-allowed;
check_active_version 1.6.0-rc1;
check_active_version 1.6.0;
) || error_and_proceed 'Latest allowed incomplete-version does not match';

cleanup || log 'error' 'Cleanup failed?!';
Expand All @@ -107,7 +107,7 @@ echo 'latest-allowed' > .opentofu-version;

(
TOFUENV_AUTO_INSTALL=true tofu version;
check_active_version 1.6.0-rc1;
check_active_version 1.6.0;
) || error_and_proceed 'Latest allowed auto-installed version does not match';

cleanup || log 'error' 'Cleanup failed?!';
Expand All @@ -123,7 +123,7 @@ echo 'latest-allowed' > chdir-dir/.opentofu-version

(
TOFUENV_AUTO_INSTALL=true tofu -chdir=chdir-dir version;
check_active_version 1.6.0-rc1 chdir-dir;
check_active_version 1.6.0 chdir-dir;
) || error_and_proceed 'Latest allowed version from -chdir does not match';

cleanup || log 'error' 'Cleanup failed?!';
Expand Down

0 comments on commit 63087aa

Please sign in to comment.