From: Dirk Mueller <dirk@dmllr.de>
Date: Sat, 29 Jun 2013 17:28:27 +0000 (+0200)
Subject: Skip brick_initiator test in virtual environments
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dec8fb779253b62bd86b1d198ee89b22f19ab3e1;p=openstack-build%2Fcinder-build.git

Skip brick_initiator test in virtual environments

/dev/disk/by-path does not exist in certain virtual
environments. Skip the test.

Fixes LP Bug #1196464

Change-Id: Ifc5bb061db59aaa6b7c089eda5e4eb1c9eff2dbf
---

diff --git a/cinder/tests/test_brick_initiator.py b/cinder/tests/test_brick_initiator.py
index 0acbce3c8..0d0f6b0d7 100644
--- a/cinder/tests/test_brick_initiator.py
+++ b/cinder/tests/test_brick_initiator.py
@@ -248,6 +248,8 @@ class ISCSIConnectorTestCase(ConnectorTestCase):
             }
         }
 
+    @test.testtools.skipUnless(os.path.exists('/dev/disk/by-path'),
+                               'Test requires /dev/disk/by-path')
     def test_connect_volume(self):
         self.stubs.Set(os.path, 'exists', lambda x: True)
         location = '10.0.2.15:3260'