From c2b900be8ca8a4b3a4417e57942efa9eaddae1a2 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Tue, 21 Feb 2017 16:46:29 +0100 Subject: [PATCH] ceph-disk/tests: Certain partition types do not work on FreeBSD Signed-off-by: Willem Jan Withagen --- src/ceph-disk/tests/test_main.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/ceph-disk/tests/test_main.py b/src/ceph-disk/tests/test_main.py index d76a5d8b6040c..c2123ebbac6fa 100644 --- a/src/ceph-disk/tests/test_main.py +++ b/src/ceph-disk/tests/test_main.py @@ -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" -- 2.39.5