Skip to content

Fix failing Linux tests #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twangboy merged 1 commit into from
Apr 27, 2026
Merged

Fix failing Linux tests #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions linux/svtminion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ _set_log_level() {
}



#
# _salt_onedir_dir_is_ga
#
Expand All @@ -423,7 +422,7 @@ _salt_onedir_dir_is_ga() {
# _get_desired_salt_version_fn
#
# Get the appropriate desirted salt version based on salt_url_version,
# latest or specified input Salt version, 3008, 3006.10, 3008.0rc1
# latest or specified input Salt version, 3008, 3006.9, 3008.0rc1
# and set salt_specific_version accordinly
#
# Note: 'latest' and four-digit major (e.g. 3006) choose the newest GA
Expand Down
1 change: 0 additions & 1 deletion tests/testarea/3006.10/salt-3006.10-onedir-windows-amd64.zip
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/testarea/3006.10rc1/salt-3006.10rc1-onedir-windows-amd64.zip
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tests/testarea/3006.9rc1/salt-3006.9rc1-onedir-windows-amd64.zip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
salt-3006.9rc1-onedir-windows-amd64.zip
12 changes: 6 additions & 6 deletions tests/windows/functional/test_get_salt_package_info.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function test_Get-SaltPackageInfo_local_major_version{
$base_url = "$($pwd.Path)\tests\testarea"
$MinionVersion = "3006"
$test = Get-SaltPackageInfo -MinionVersion $MinionVersion
if ( $test.version -ne "3006.10" ) { $failed = 1 }
if ( $test.version -ne "3006.9" ) { $failed = 1 }
$exp_name = "salt-$($test.version)-onedir-windows-amd64.zip"
$exp_url = "$base_url/$($test.version)/$exp_name"
$failed = 0
Expand All @@ -86,8 +86,8 @@ function test_Get-SaltPackageInfo_local_major_version{
return $failed
}

# testarea includes 3006.10 (GA) and 3006.10rc1 (prerelease). Global "latest"
# stays 3007.1; major "3006" picks GA 3006.10; exact "3006.10rc1" picks the RC dir.
# testarea has GA 3006.9 (highest 3006.x); prerelease 3006.9rc1 is separate. Global
# "latest" stays 3007.1; major "3006" picks GA 3006.9; exact "3006.9rc1" picks the RC dir.
function test_Get-SaltPackageInfo_local_latest_unchanged_when_rc_not_highest_ga {
$base_url = "$($pwd.Path)\tests\testarea"
$MinionVersion = "latest"
Expand All @@ -107,7 +107,7 @@ function test_Get-SaltPackageInfo_local_major_3006_resolves_to_ga_not_rc {
$MinionVersion = "3006"
$test = Get-SaltPackageInfo -MinionVersion $MinionVersion
$failed = 0
if ( $test.version -ne "3006.10" ) { $failed = 1 }
if ( $test.version -ne "3006.9" ) { $failed = 1 }
$exp_name = "salt-$($test.version)-onedir-windows-amd64.zip"
$exp_url = "$base_url/$($test.version)/$exp_name"
if ( $test.file_name -ne $exp_name ) { $failed = 1 }
Expand All @@ -118,10 +118,10 @@ function test_Get-SaltPackageInfo_local_major_3006_resolves_to_ga_not_rc {

function test_Get-SaltPackageInfo_local_exact_rc_version {
$base_url = "$($pwd.Path)\tests\testarea"
$MinionVersion = "3006.10rc1"
$MinionVersion = "3006.9rc1"
$test = Get-SaltPackageInfo -MinionVersion $MinionVersion
$failed = 0
if ( $test.version -ne "3006.10rc1" ) { $failed = 1 }
if ( $test.version -ne "3006.9rc1" ) { $failed = 1 }
$exp_name = "salt-$($test.version)-onedir-windows-amd64.zip"
$exp_url = "$base_url/$($test.version)/$exp_name"
if ( $test.file_name -ne $exp_name ) { $failed = 1 }
Expand Down
Loading