[RM-12151] Enable tests for disk subcommands

Signed-off-by: Travis Rhoden <trhoden@redhat.com>

diff --git a/ceph_deploy/tests/parser/test_disk.py b/ceph_deploy/tests/parser/test_disk.py
index 2483192e3f5fbfeece8a6e4b638ab775dec93c01..40f8bfc6107bc9598d5f59c82b1f3223ab721636 100644 (file)
--- a/ceph_deploy/tests/parser/test_disk.py
+++ b/ceph_deploy/tests/parser/test_disk.py
@@ -28,7 +28,6 @@ class TestParserDisk(object):
         out, err = capsys.readouterr()
         assert 'invalid choice' in err
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12151")
     def test_disk_list_help(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('disk list --help'.split())
@@ -52,7 +51,6 @@ class TestParserDisk(object):
         hosts = [x[0] for x in args.disk]
         assert hosts == hostnames
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12151")
     def test_disk_prepare_help(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('disk prepare --help'.split())
@@ -76,7 +74,6 @@ class TestParserDisk(object):
         args = self.parser.parse_args('disk prepare --fs-type ext4 host1:sdb'.split())
         assert args.fs_type == "ext4"
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12151")
     def test_disk_prepare_fstype_invalid(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('disk prepare --fs-type bork host1:sdb'.split())
@@ -117,7 +114,6 @@ class TestParserDisk(object):
         hosts = [x[0] for x in args.disk]
         assert hosts == hostnames
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12151")
     def test_disk_activate_help(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('disk activate --help'.split())
@@ -141,7 +137,6 @@ class TestParserDisk(object):
         hosts = [x[0] for x in args.disk]
         assert hosts == hostnames
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12151")
     def test_disk_zap_help(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('disk zap --help'.split())