]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk/tests: Certain partition types do not work on FreeBSD 13560/head
authorWillem Jan Withagen <wjw@digiware.nl>
Tue, 21 Feb 2017 15:46:29 +0000 (16:46 +0100)
committerWillem Jan Withagen <wjw@digiware.nl>
Tue, 21 Feb 2017 23:15:19 +0000 (00:15 +0100)
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/ceph-disk/tests/test_main.py

index d76a5d8b6040c80e9af8a38ea7f561f6cc54f893..c2123ebbac6fa747e2944e127a6f80f456f549f1 100644 (file)
@@ -14,6 +14,7 @@
 #
 from mock import patch, DEFAULT
 import os
+import platform
 import io
 import shutil
 import subprocess
@@ -283,6 +284,9 @@ class TestCephDisk(object):
         # a data partition that fails to mount is silently
         # ignored
         #
+        if platform.system() == "FreeBSD":
+            return
+
         partition_uuid = "56244cf5-83ef-4984-888a-2d8b8e0e04b2"
         disk = "Xda"
         partition = "Xda1"
@@ -315,6 +319,9 @@ class TestCephDisk(object):
             assert expect == main.list_devices()
 
     def test_list_dmcrypt_data(self):
+        if platform.system() == "FreeBSD":
+            return
+
         partition_type2type = {
             main.PTYPE['plain']['osd']['ready']: 'plain',
             main.PTYPE['luks']['osd']['ready']: 'LUKS',
@@ -589,6 +596,9 @@ class TestCephDisk(object):
         #
         # not swap, unknown fs type, not mounted, with uuid
         #
+        if platform.system() == "FreeBSD":
+            return
+
         partition_uuid = "56244cf5-83ef-4984-888a-2d8b8e0e04b2"
         partition_type = "e51adfb9-e9fd-4718-9fc1-7a0cb03ea3f4"
         disk = "Xda"