[PATCH] Fix test fail of btrfs/006 caused by updated _filter_uuid()

[PATCH] Fix test fail of btrfs/006 caused by updated _filter_uuid()

[Zhaolei]

From: Zhao Lei <zhaolei@cn.fujitsu.com>

_filter_uuid() get updated and changed output from:
 uuid: <UUID>
 ->
 uuid:  <UUID>

It is a typo introduced by xfs/077, this patch fixed this.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
---
 common/filter     | 2 +-
 tests/xfs/077.out | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/filter b/common/filter
index 8db1b3e..af456c9 100644
--- a/common/filter
+++ b/common/filter
@@ -277,7 +277,7 @@ _filter_uuid()
 		UUID=$1
 		sed -e "s/\(uuid[ :=]\+\) $UUID/\1 <EXACTUUID>/i"
 	else
-		sed -e "s/\(uuid[ :=]\+\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/ig"
+		sed -e "s/\(uuid[ :=]\+\) [0-9a-f-][0-9a-f-]*/\1 <UUID>/ig"
 	fi
 }
 
diff --git a/tests/xfs/077.out b/tests/xfs/077.out
index fdc7d72..4e18087 100644
--- a/tests/xfs/077.out
+++ b/tests/xfs/077.out
@@ -2,7 +2,7 @@ QA output created by 077
 == Generate new UUID
 Clearing log and setting UUID
 writing all SBs
-new UUID =  <UUID>
+new UUID = <UUID>
 == Rewrite UUID
 old UUID = <EXACTUUID>
 Clearing log and setting UUID
-- 
1.8.5.1

Re: [PATCH] Fix test fail of btrfs/006 caused by updated _filter_uuid()

[Omar Sandoval]

On Thu, Aug 20, 2015 at 10:33:49AM +0800, Zhaolei wrote:
> From: Zhao Lei <zhaolei@cn.fujitsu.com>
> 
> _filter_uuid() get updated and changed output from:
>  uuid: <UUID>
>  ->
>  uuid:  <UUID>
> 
> It is a typo introduced by xfs/077, this patch fixed this.
> 
> Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>

Thanks, Zhao Lei, I ran into this today.

Reviewed-by: Omar Sandoval <osandov@fb.com>

> ---
>  common/filter     | 2 +-
>  tests/xfs/077.out | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/common/filter b/common/filter
> index 8db1b3e..af456c9 100644
> --- a/common/filter
> +++ b/common/filter
> @@ -277,7 +277,7 @@ _filter_uuid()
>  		UUID=$1
>  		sed -e "s/\(uuid[ :=]\+\) $UUID/\1 <EXACTUUID>/i"
>  	else
> -		sed -e "s/\(uuid[ :=]\+\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/ig"
> +		sed -e "s/\(uuid[ :=]\+\) [0-9a-f-][0-9a-f-]*/\1 <UUID>/ig"
>  	fi
>  }
>  
> diff --git a/tests/xfs/077.out b/tests/xfs/077.out
> index fdc7d72..4e18087 100644
> --- a/tests/xfs/077.out
> +++ b/tests/xfs/077.out
> @@ -2,7 +2,7 @@ QA output created by 077
>  == Generate new UUID
>  Clearing log and setting UUID
>  writing all SBs
> -new UUID =  <UUID>
> +new UUID = <UUID>
>  == Rewrite UUID
>  old UUID = <EXACTUUID>
>  Clearing log and setting UUID
> -- 
> 1.8.5.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Omar