From: John Griffith <john.griffith8@gmail.com>
Date: Wed, 30 Jul 2014 02:20:31 +0000 (-0600)
Subject: Skip incompatible test on OSX
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ae8bb5afd3354e10b3ec93e03a0b5b2fb5bdcb0a;p=openstack-build%2Fcinder-build.git

Skip incompatible test on OSX

Can't seem to get the test:
cinder.tests.test_volume.VolumeTestCase.test_delete_no_dev_fails
to run right, tried macports and homebrew versions of fileutils
but still get makedir failures. Give up and just detect if OSX
and skip.

Change-Id: Ic2f7603cf2960e2fbaac9fce677461f60ded541d
---

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index c72178dc0..35d047318 100644
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -24,6 +24,7 @@ import mock
 import os
 import shutil
 import socket
+from sys import platform
 import tempfile
 
 import eventlet
@@ -71,7 +72,7 @@ QUOTAS = quota.QUOTAS
 CONF = cfg.CONF
 
 ENCRYPTION_PROVIDER = 'nova.volume.encryptors.cryptsetup.CryptsetupEncryptor'
-
+PLATFORM = platform
 fake_opt = [
     cfg.StrOpt('fake_opt', default='fake', help='fake opts')
 ]
@@ -1937,6 +1938,7 @@ class VolumeTestCase(BaseVolumeTestCase):
         self.volume.delete_snapshot(self.context, snapshot_id)
         self.volume.delete_volume(self.context, volume_id)
 
+    @test.testtools.skipIf(platform == "darwin", "SKIP on OSX")
     def test_delete_no_dev_fails(self):
         """Test delete snapshot with no dev file fails."""
         self.stubs.Set(os.path, 'exists', lambda x: False)