From: Willem Jan Withagen Date: Thu, 13 Apr 2017 10:38:17 +0000 (+0200) Subject: ceph-disk/tests/test_main.py: Some partition tests are no longer valid under FreeBSD X-Git-Tag: v12.0.2~21^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=291815aae19c997821b43beaa0e78856fb150e3d;p=ceph.git ceph-disk/tests/test_main.py: Some partition tests are no longer valid under FreeBSD Signed-off-by: Willem Jan Withagen --- diff --git a/src/ceph-disk/tests/test_main.py b/src/ceph-disk/tests/test_main.py index 5cb3516b40c8..69a7dfd9493b 100644 --- a/src/ceph-disk/tests/test_main.py +++ b/src/ceph-disk/tests/test_main.py @@ -38,6 +38,9 @@ class TestCephDisk(object): main.setup_logging(verbose=True, log_stdout=False) def test_main_list_json(self, capsys): + if platform.system() == "FreeBSD": + return + data = tempfile.mkdtemp() main.setup_statedir(data) args = main.parse_args(['list', '--format', 'json']) @@ -50,6 +53,9 @@ class TestCephDisk(object): shutil.rmtree(data) def test_main_list_plain(self, capsys): + if platform.system() == "FreeBSD": + return + data = tempfile.mkdtemp() main.setup_statedir(data) args = main.parse_args(['list']) @@ -267,6 +273,9 @@ class TestCephDisk(object): 'state': 'prepared'} == desc def test_list_all_partitions(self): + if platform.system() == "FreeBSD": + return + disk = "Xda" partition = "Xda1" @@ -1306,6 +1315,9 @@ class TestCephDiskDeactivateAndDestroy(unittest.TestCase): cluster, osd_id) def test_main_fix(self): + if platform.system() == "FreeBSD": + return + args = main.parse_args(['fix', '--all', '--selinux', '--permissions']) commands = []