Skip to content

Commit

Permalink
Merge pull request #13560 from wjwithagen/wip-wjw-ceph-disk-tests
Browse files Browse the repository at this point in the history
ceph-disk/tests: Certain partition types do not work on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Mar 7, 2017
2 parents d124e6f + c2b900b commit cec7e1a
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/ceph-disk/tests/test_main.py
Expand Up @@ -14,6 +14,7 @@
#
from mock import patch, DEFAULT
import os
import platform
import io
import shutil
import subprocess
Expand Down Expand Up @@ -283,6 +284,9 @@ def test_list_data(self):
# 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"
Expand Down Expand Up @@ -315,6 +319,9 @@ def get_partition_type(dev):
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',
Expand Down Expand Up @@ -589,6 +596,9 @@ def test_list_other(self):
#
# 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"
Expand Down

0 comments on commit cec7e1a

Please sign in to comment.