Skip to content
Snippets Groups Projects
Commit 61da51ef authored by Alexander van Amesfoort's avatar Alexander van Amesfoort
Browse files

Task #8185: fix tStorageProcesses qpid msg cmp on CentOS 7: also skip <xml >...

Task #8185: fix tStorageProcesses qpid msg cmp on CentOS 7: also skip <xml > tag on message cmp, since some qpid versions or bindings may add an encoding in addition to version. (This may erroneously skip checking xml version. If so, fine tune the cmp further.)
parent 83d36d0b
No related branches found
No related tags found
No related merge requests found
...@@ -194,7 +194,8 @@ function send_msg() { ...@@ -194,7 +194,8 @@ function send_msg() {
} }
function compare_msg() { function compare_msg() {
# Compare two messages, ignoring uncontrollable fields (UUID, timestamp). # Compare two messages, ignoring uncontrollable fields (UUID, timestamp,
# encoding="UTF-8" within <?xml ?> tag added by qpid).
# Both messages are expected to be in files (or filedescriptors). # Both messages are expected to be in files (or filedescriptors).
# #
# Usage: # Usage:
...@@ -203,7 +204,7 @@ function compare_msg() { ...@@ -203,7 +204,7 @@ function compare_msg() {
GENERATED="$2" GENERATED="$2"
function compare_msg_filter() { function compare_msg_filter() {
fgrep -v '<uuid>' | fgrep -v '<timestamp>' fgrep -v '<uuid>' | fgrep -v '<timestamp>' | fgrep -v '<?xml '
} }
diff -w <(<"$REFERENCE" compare_msg_filter) <(<"$GENERATED" compare_msg_filter) diff -w <(<"$REFERENCE" compare_msg_filter) <(<"$GENERATED" compare_msg_filter)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment