From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 21 May 2015 14:45:07 +0000 (+0200)
Subject: tests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh
X-Git-Tag: v9.0.2~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab8e9e39c8f1e235eeae547787ae5984165476e5;p=ceph.git

tests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh

Run cephtool-test-{mon,osd,mds}.sh with CEPH_CLI_TEST_DUP_COMMAND=1 to
detect idempotency related problems during make check. This is how
ceph-qa-suite/tasks/workunit.py will run
suites/rados/singleton/all/cephtool.yaml and it's easier to fix when
make check fails rather than later on when a fully populated rados suite
has one failed job.

http://tracker.ceph.com/issues/11618 Refs: #11618

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/cephtool-test-mds.sh b/src/test/cephtool-test-mds.sh
index f3ecd9634aeaf..0fc215175350e 100755
--- a/src/test/cephtool-test-mds.sh
+++ b/src/test/cephtool-test-mds.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 #
+# Copyright (C) 2014, 2015 Red Hat <contact@redhat.com>
 # Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
@@ -14,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+CEPH_CLI_TEST_DUP_COMMAND=1 \
 MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 test/vstart_wrapper.sh \
     ../qa/workunits/cephtool/test.sh \
     --test-mds \
diff --git a/src/test/cephtool-test-mon.sh b/src/test/cephtool-test-mon.sh
index d24f774ae63eb..2194f2d8dd8e5 100755
--- a/src/test/cephtool-test-mon.sh
+++ b/src/test/cephtool-test-mon.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 #
+# Copyright (C) 2014, 2015 Red Hat <contact@redhat.com>
 # Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
@@ -14,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+CEPH_CLI_TEST_DUP_COMMAND=1 \
 MON=3 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 test/vstart_wrapper.sh \
     ../qa/workunits/cephtool/test.sh \
     --test-mon \
diff --git a/src/test/cephtool-test-osd.sh b/src/test/cephtool-test-osd.sh
index dbbe6441f00e1..c016d24b2502e 100755
--- a/src/test/cephtool-test-osd.sh
+++ b/src/test/cephtool-test-osd.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 #
+# Copyright (C) 2014, 2015 Red Hat <contact@redhat.com>
 # Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
@@ -14,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+CEPH_CLI_TEST_DUP_COMMAND=1 \
 MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 test/vstart_wrapper.sh \
     ../qa/workunits/cephtool/test.sh \
     --test-osd \