The result of tests/057 changes based on the store directory. We moved the default store from from /tmp/sheepdog to /tmp/sheepdog/057, so this patch also modifies the 057.out.
When we set the store directory manually, this patch skips 057. Signed-off-by: MORITA Kazutaka <morita.kazut...@lab.ntt.co.jp> --- tests/057 | 4 ++++ tests/057.out | 38 +++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/tests/057 b/tests/057 index a9887eb..e1a33ac 100755 --- a/tests/057 +++ b/tests/057 @@ -13,6 +13,10 @@ md=true . ./common.rc . ./common.filter +if [ "$STORE" != "/tmp/sheepdog/057" ]; then + _notrun "This test cannot be run when WD is manually set" +fi + _cleanup for i in 0 1 2; do diff --git a/tests/057.out b/tests/057.out index ab9e593..19bc86c 100644 --- a/tests/057.out +++ b/tests/057.out @@ -1,15 +1,15 @@ QA output created by 057 using backend farm store Id MASKED Use Path -0 MASKED GB 48 MB STORE/0/d0 -1 MASKED GB 24 MB STORE/0/d1 -2 MASKED GB 32 MB STORE/0/d2 +0 MASKED GB 32 MB STORE/0/d0 +1 MASKED GB 32 MB STORE/0/d1 +2 MASKED GB 40 MB STORE/0/d2 Id MASKED Use Path -0 MASKED GB 16 MB STORE/0/d0 -1 MASKED GB 12 MB STORE/0/d1 -2 MASKED GB 32 MB STORE/0/d2 -3 MASKED GB 8.0 MB STORE/0/d3 -4 MASKED GB 28 MB STORE/0/d4 +0 MASKED GB 4.0 MB STORE/0/d0 +1 MASKED GB 20 MB STORE/0/d1 +2 MASKED GB 28 MB STORE/0/d2 +3 MASKED GB 20 MB STORE/0/d3 +4 MASKED GB 24 MB STORE/0/d4 finish check&repair test Cluster status: running @@ -22,15 +22,15 @@ Failed to execute request, look for sheep.log for more information Nodes In Recovery: Id Host:Port V-Nodes Zone Id MASKED Use Path -0 MASKED GB 16 MB STORE/0/d0 -1 MASKED GB 12 MB STORE/0/d1 -2 MASKED GB 32 MB STORE/0/d2 -3 MASKED GB 8.0 MB STORE/0/d3 -4 MASKED GB 28 MB STORE/0/d4 +0 MASKED GB 4.0 MB STORE/0/d0 +1 MASKED GB 20 MB STORE/0/d1 +2 MASKED GB 28 MB STORE/0/d2 +3 MASKED GB 20 MB STORE/0/d3 +4 MASKED GB 24 MB STORE/0/d4 Id MASKED Use Path -0 MASKED GB 32 MB STORE/0/d2 -1 MASKED GB 24 MB STORE/0/d3 -2 MASKED GB 40 MB STORE/0/d4 +0 MASKED GB 28 MB STORE/0/d2 +1 MASKED GB 32 MB STORE/0/d3 +2 MASKED GB 36 MB STORE/0/d4 finish check&repair test Cluster status: running @@ -43,9 +43,9 @@ Failed to execute request, look for sheep.log for more information Nodes In Recovery: Id Host:Port V-Nodes Zone Id MASKED Use Path -0 MASKED GB 32 MB STORE/0/d2 -1 MASKED GB 24 MB STORE/0/d3 -2 MASKED GB 40 MB STORE/0/d4 +0 MASKED GB 28 MB STORE/0/d2 +1 MASKED GB 32 MB STORE/0/d3 +2 MASKED GB 36 MB STORE/0/d4 Cluster status: running Cluster created at DATE -- 1.8.1.3.566.gaa39828 -- sheepdog mailing list sheepdog@lists.wpkg.org http://lists.wpkg.org/mailman/listinfo/sheepdog
