[sheepdog] [PATCH] Change tests outputs to be suitable for new cluster info format

2015-02-02 Thread Wang Dongxu
From: Wang Dongxu wangdon...@cmss.chinamobile.com

Since commit 4fea6f95a2de90f45f90415f289083c6b29120a7, dog cluster info change
its output format, to make sure tests/functional cases are suitable for the new
format, modified these output.

Signed-off-by: Wang Dongxu wangdon...@cmss.chinamobile.com
---
 tests/functional/001.out |   36 +++---
 tests/functional/002.out |   30 +-
 tests/functional/003.out |   30 +-
 tests/functional/004.out |  100 ++--
 tests/functional/005.out |   90 
 tests/functional/007.out |   20 
 tests/functional/010.out |8 ++--
 tests/functional/025.out |   24 
 tests/functional/030.out |4 +-
 tests/functional/043.out |   82 +++---
 tests/functional/051.out |   18 +++---
 tests/functional/052.out |  116 +-
 tests/functional/053.out |  128 +++---
 tests/functional/054.out |   10 ++--
 tests/functional/055.out |   20 
 tests/functional/056.out |   14 +++---
 tests/functional/057.out |   18 +++---
 tests/functional/063.out |8 ++--
 tests/functional/064.out |   10 ++--
 tests/functional/065.out |8 ++--
 tests/functional/066.out |   72 +-
 tests/functional/068.out |   36 +++---
 tests/functional/069.out |8 ++--
 tests/functional/070.out |   36 +++---
 tests/functional/073.out |4 +-
 tests/functional/085.out |4 +-
 tests/functional/088.out |   12 ++--
 tests/functional/096.out |8 ++--
 tests/functional/098.out |   26 +-
 29 files changed, 490 insertions(+), 490 deletions(-)

diff --git a/tests/functional/001.out b/tests/functional/001.out
index 82d27da..ef39e0a 100644
--- a/tests/functional/001.out
+++ b/tests/functional/001.out
@@ -5,29 +5,29 @@ Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  4 [127.0.0.1:7002]
-DATE  3 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  4 [127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128]
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  4 [127.0.0.1:7002]
-DATE  3 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  4 [127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128]
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  4 [127.0.0.1:7002]
-DATE  3 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  4 [127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128]
diff --git a/tests/functional/002.out b/tests/functional/002.out
index ce99957..0efa4be 100644
--- a/tests/functional/002.out
+++ b/tests/functional/002.out
@@ -5,26 +5,26 @@ Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  3 [127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  3 [127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7002:128]

Re: [sheepdog] [PATCH] Change tests outputs to be suitable for new cluster info format

2015-02-02 Thread Liu Yuan
On Tue, Feb 03, 2015 at 12:19:12PM +0800, Wang Dongxu wrote:
 Since commit 4fea6f95a2de90f45f90415f289083c6b29120a7, dog cluster info change
 its output format, to make sure tests/functional cases are suitable for the 
 new
 format, modified these output.
 
 Signed-off-by: Wang Dongxu wangdon...@cmss.chinamobile.com

Applied since this is an easy and obvious fix for the tests.

Thanks
Yuan
-- 
sheepdog mailing list
sheepdog@lists.wpkg.org
https://lists.wpkg.org/mailman/listinfo/sheepdog


[sheepdog] [PATCH] Change tests outputs to be suitable for new cluster info format

2015-02-02 Thread Wang Dongxu
Since commit 4fea6f95a2de90f45f90415f289083c6b29120a7, dog cluster info change
its output format, to make sure tests/functional cases are suitable for the new
format, modified these output.

Signed-off-by: Wang Dongxu wangdon...@cmss.chinamobile.com
---
 tests/functional/001.out |   36 +++---
 tests/functional/002.out |   30 +-
 tests/functional/003.out |   30 +-
 tests/functional/004.out |  100 ++--
 tests/functional/005.out |   90 
 tests/functional/007.out |   20 
 tests/functional/010.out |8 ++--
 tests/functional/025.out |   24 
 tests/functional/030.out |4 +-
 tests/functional/043.out |   82 +++---
 tests/functional/051.out |   18 +++---
 tests/functional/052.out |  116 +-
 tests/functional/053.out |  128 +++---
 tests/functional/054.out |   10 ++--
 tests/functional/055.out |   20 
 tests/functional/056.out |   14 +++---
 tests/functional/057.out |   18 +++---
 tests/functional/063.out |8 ++--
 tests/functional/064.out |   10 ++--
 tests/functional/065.out |8 ++--
 tests/functional/066.out |   72 +-
 tests/functional/068.out |   36 +++---
 tests/functional/069.out |8 ++--
 tests/functional/070.out |   36 +++---
 tests/functional/073.out |4 +-
 tests/functional/085.out |4 +-
 tests/functional/088.out |   12 ++--
 tests/functional/096.out |8 ++--
 tests/functional/098.out |   26 +-
 29 files changed, 490 insertions(+), 490 deletions(-)

diff --git a/tests/functional/001.out b/tests/functional/001.out
index 82d27da..ef39e0a 100644
--- a/tests/functional/001.out
+++ b/tests/functional/001.out
@@ -5,29 +5,29 @@ Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  4 [127.0.0.1:7002]
-DATE  3 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  4 [127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128]
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  4 [127.0.0.1:7002]
-DATE  3 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  4 [127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128]
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  4 [127.0.0.1:7002]
-DATE  3 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  4 [127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128]
diff --git a/tests/functional/002.out b/tests/functional/002.out
index ce99957..0efa4be 100644
--- a/tests/functional/002.out
+++ b/tests/functional/002.out
@@ -5,26 +5,26 @@ Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  3 [127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  1 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
 
-Epoch Time   Version
-DATE  4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-DATE  3 [127.0.0.1:7002]
-DATE  2 [127.0.0.1:7001, 127.0.0.1:7002]
-DATE  1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
+Epoch Time   Version [Host:Port:V-Nodes,,,]
+DATE  4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128]
+DATE  3 [127.0.0.1:7002:128]
+DATE  2 [127.0.0.1:7001:128, 127.0.0.1:7002:128]