From: Jian Yu <yujian@whamcloud.com>
Date: Thu, 1 Apr 2021 18:49:29 +0000 (-0700)
Subject: EX-2933 tests: replace the newline with a space in $params
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8e9164f6f4ae8d6144605bfd52ff7dbce9ecaf75;p=fs%2Flustre-release.git

EX-2933 tests: replace the newline with a space in $params

This patch replaces the newline with a space in $params
passing to wait_import_state().

Lustre-change: https://review.whamcloud.com/43159
Lustre-commit: 94332d277e0d79cf0dd345533ba186e73a9e19af

Fixes: ab4a750a51 ("EX-2882 tests: fix hot-pools.sh issues on single node")
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Change-Id: I09c9b72bc4e59cf1ceaf8ae17c36c7f8c567c730
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/43195
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Li Xi <lixi@ddn.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 0dac4ad..e0fe3d0 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -7582,6 +7582,8 @@ _wait_osc_import_state() {
 		params=$param
 	fi
 
+	params=$(tr '\n' ' ' <<< $params)
+
 	if ! do_rpc_nodes "$(facet_active_host $facet)" \
 			wait_import_state $expected "$params" $maxtime; then
 		error "$facet: import is not in $expected state after $maxtime"