From: Jan Fajerski <jfajerski@suse.com>
Date: Thu, 15 Aug 2019 11:28:42 +0000 (+0200)
Subject: ceph-volume: fix batch functional tests, idempotent test must check stderr
X-Git-Tag: v14.2.3~38^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a9522f2318848b0cebc04917af37c47fe7dd8bb4;p=ceph.git

ceph-volume: fix batch functional tests, idempotent test must check stderr

Fixes: https://tracker.ceph.com/issues/41295

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 88807110f3014e7a2a39c37ae5c64bb3ab107d80)
---

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml
index c9375e2b7fb7f..1b0fe1f8cebfd 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml
@@ -46,7 +46,7 @@
         msg: "lvm batch failed idempotency check"
       when:
          - batch_cmd.rc != 0
-         - "'strategy changed' not in batch_cmd.stdout"
+         - "'strategy changed' not in batch_cmd.stderr"
 
     - name: run batch --report to see if devices get filtered
       command: "ceph-volume --cluster {{ cluster }} lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
@@ -59,5 +59,5 @@
       fail:
         msg: "lvm batch --report failed idempotency check"
       when:
-         - batch_cmd.rc != 0
-         - "'strategy changed' not in batch_cmd.stdout"
+         - report_cmd.rc != 0
+         - "'strategy changed' not in report_cmd.stderr"
diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml
index 853f6a1cb6861..4c5cbfc9a3b3d 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml
@@ -46,7 +46,7 @@
         msg: "lvm batch failed idempotency check"
       when:
          - batch_cmd.rc != 0
-         - "'strategy changed' not in batch_cmd.stdout"
+         - "'strategy changed' not in batch_cmd.stderr"
 
     - name: run batch --report to see if devices get filtered
       command: "ceph-volume --cluster {{ cluster }} lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} --db-devices {{ devices[2:] | join(' ') }}"
@@ -59,5 +59,5 @@
       fail:
         msg: "lvm batch --report failed idempotency check"
       when:
-         - batch_cmd.rc != 0
-         - "'strategy changed' not in batch_cmd.stdout"
+         - report_cmd.rc != 0
+         - "'strategy changed' not in report_cmd.stderr"