-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix RlistEqual comparison on lists of different lengths
The original issue that leads to this is the fact that the cache for execresult and execresult_as_data were mixed. This is caused by two separate issues: * The function cache uses the args list as key and discards the function itself. This means different function with the same args are considered identical, and cache is reused. * The args are passed as an Rlist, and the used Rlist comparison ignores the additional items of the longest list when comparing two lists of different lengths, leading to treating execresult and execresult_as_data as identical when using the same command and shell args. This PR only fixes the specific case of execresult, but leaves other function cache issues (e.g. host2ip vs. ip2host could be confused).
- Loading branch information
Showing
3 changed files
with
61 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
tests/acceptance/01_vars/04_containers/execresult_and_as_data.cf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
####################################################### | ||
# | ||
# Test the ability to call the same command with execresult and execresult_as_data | ||
# | ||
####################################################### | ||
|
||
body common control | ||
{ | ||
inputs => { "../../default.cf.sub" }; | ||
bundlesequence => { default("$(this.promise_filename)") }; | ||
version => "1.0"; | ||
} | ||
|
||
####################################################### | ||
|
||
|
||
bundle agent init | ||
{ | ||
} | ||
|
||
####################################################### | ||
|
||
bundle agent test | ||
{ | ||
vars: | ||
!windows:: | ||
"res1" string => execresult("echo test", "useshell"); | ||
"res2" data => execresult_as_data("echo test", "useshell", "stdout"); | ||
windows:: | ||
"res1" string => execresult("echo test", "powershell"); | ||
"res2" data => execresult_as_data("echo test", "powershell", "stdout"); | ||
} | ||
|
||
|
||
####################################################### | ||
|
||
bundle agent check | ||
{ | ||
methods: | ||
"any" usebundle => dcs_check_strcmp("${test.res1}", "${test.res2[output]}", "$(this.promise_filename)", "no"); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters