import 14.2.4 nautilus point release

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / test_main.py

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/test_main.py b/ceph/src/ceph-volume/ceph_volume/tests/test_main.py
index 45dcfff851ab87310b0e535fa37b3d4bbd4caaa3..b88b2bc501d45495a19a8f3ed1f2f2ee37e9cce1 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/test_main.py
+++ b/ceph/src/ceph-volume/ceph_volume/tests/test_main.py
@@ -37,7 +37,7 @@ class TestVolume(object):
             main.Volume(argv=['ceph-volume', '--cluster', 'barnacle', 'lvm', '--help'])
         # make sure we aren't causing an actual error
         assert error.value.code == 0
-        log = caplog.records[1]
+        log = caplog.records[-1]
         assert log.message == 'ignoring inability to load ceph.conf'
         assert log.levelname == 'ERROR'
 
@@ -46,6 +46,6 @@ class TestVolume(object):
             main.Volume(argv=['ceph-volume', '--cluster', 'barnacle', 'lvm', '--help'])
         # make sure we aren't causing an actual error
         assert error.value.code == 0
-        log = caplog.records[0]
+        log = caplog.records[-2]
         assert log.message == 'Running command: ceph-volume --cluster barnacle lvm --help'
         assert log.levelname == 'INFO'