From 61da51efb47fb701e1276adcb311f6c94e4a8bc2 Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Tue, 28 Jul 2015 18:24:34 +0000
Subject: [PATCH] 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.)
---
LCS/MessageBus/test/MessageFuncs.sh.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/LCS/MessageBus/test/MessageFuncs.sh.in b/LCS/MessageBus/test/MessageFuncs.sh.in
index 60b70c76e91..9e56c7065fa 100644
--- a/LCS/MessageBus/test/MessageFuncs.sh.in
+++ b/LCS/MessageBus/test/MessageFuncs.sh.in
@@ -194,7 +194,8 @@ function send_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).
#
# Usage:
@@ -203,7 +204,7 @@ function compare_msg() {
GENERATED="$2"
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)
--
GitLab