From c6676c2e572611c9a99b223fa6908ddc595bdefb Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Sun, 23 Oct 2011 15:39:08 +0000 Subject: [PATCH] Expect failure with real /dev dir As udev is for now incapable to create such devices turn this test error into warning. --- test/t-mdata-strings.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/t-mdata-strings.sh b/test/t-mdata-strings.sh index 56cb92c7b..2cac8ba7e 100755 --- a/test/t-mdata-strings.sh +++ b/test/t-mdata-strings.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008 Red Hat, Inc. All rights reserved. +# Copyright (C) 2008-2011 Red Hat, Inc. All rights reserved. # # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions @@ -13,8 +13,9 @@ . lib/test -aux prepare_devs 1 +aux prepare_devs 2 +# for udev impossible to create pv_ugly="__\"!@#\$%^&*,()|@||'\\\"__pv1" # 'set up temp files, loopback devices' @@ -23,9 +24,11 @@ dmsetup rename "$name" "$PREFIX$pv_ugly" dev1=$(dirname "$dev1")/$PREFIX$pv_ugly # 'pvcreate, vgcreate on filename with backslashed chars' -pvcreate "$dev1" -vgcreate $vg "$dev1" - +created=$dev1 +# when used with real udev without fallback, it will fail here +pvcreate "$dev1" || created=$dev2 +pvs | should grep $dev1 +vgcreate $vg "$created" # 'no parse errors and VG really exists' vgs 2>err not grep "Parse error" err; -- 2.43.5