summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Minar <miminar@redhat.com>2014-03-10 13:11:18 +0100
committerMichal Minar <miminar@redhat.com>2014-03-10 13:11:18 +0100
commit511bf97cc367e950a8837f982297227e559625c8 (patch)
tree658a16798802c004007bcff570ead254ba312963
parent84b1e6ab2013b4343c2192f9dfd221cdea611eaf (diff)
parent20482218cd5e5ce52ddcad5ca3b3984ee9914dc1 (diff)
downloadopenlmi-scripts-511bf97cc367e950a8837f982297227e559625c8.tar.gz
openlmi-scripts-511bf97cc367e950a8837f982297227e559625c8.tar.xz
openlmi-scripts-511bf97cc367e950a8837f982297227e559625c8.zip
Merge pull request #74 from jsafrane/devel/fix-test
Fixed MD RAID tests, sometimes there is no 'hostname:' in RAID /dev/disk...
-rw-r--r--commands/storage/test/lmi/test_raid.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/commands/storage/test/lmi/test_raid.sh b/commands/storage/test/lmi/test_raid.sh
index 0295497..001b5cb 100644
--- a/commands/storage/test/lmi/test_raid.sh
+++ b/commands/storage/test/lmi/test_raid.sh
@@ -68,7 +68,7 @@ function test_raid() {
rlLogInfo "Check lmi storage raid show output"
rlRun -s "$LMI -NHL csv storage raid show $name"
- rlAssertGrep "\"DeviceID\",\"/dev/disk/by-id/md-name-.*:$name\"" $rlRun_LOG
+ rlAssertGrep "\"DeviceID\",\"/dev/disk/by-id/md-name-.*$name\"" $rlRun_LOG
rlAssertGrep "\"Name\",\"/dev/md/$name\"" $rlRun_LOG
rlAssertGrep "\"ElementName\",\"$name\"" $rlRun_LOG
rlAssertGrep "\"RAID Level\",$level" $rlRun_LOG
@@ -93,7 +93,7 @@ function test_raid() {
rlLogInfo "Check lmi storage raid show output"
rlRun -s "$LMI -NHL csv storage raid show $name" 1
- rlAssertNotGrep "\"DeviceID\",\"/dev/disk/by-id/md-name-.*:$name\"" $rlRun_LOG
+ rlAssertNotGrep "\"DeviceID\",\"/dev/disk/by-id/md-name-.*$name\"" $rlRun_LOG
rlAssertNotGrep "\"Name\",\"/dev/md/$name\"" $rlRun_LOG
rlPhaseEnd
}