import 15.2.0 Octopus source

[ceph.git] / ceph / qa / tasks / cephfs / test_admin.py

diff --git a/ceph/qa/tasks/cephfs/test_admin.py b/ceph/qa/tasks/cephfs/test_admin.py
index ccc7847f7ac9d060d1450b5197203c4e5e0ee79b..374f75a72cf0c3a9c57a05054ed134ea848056d9 100644 (file)
--- a/ceph/qa/tasks/cephfs/test_admin.py
+++ b/ceph/qa/tasks/cephfs/test_admin.py
@@ -1,6 +1,5 @@
 from teuthology.orchestra.run import CommandFailedError
 
-from unittest import case
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from tasks.cephfs.fuse_mount import FuseMount
 
@@ -45,7 +44,7 @@ class TestAdminCommands(CephFSTestCase):
         """
 
         p = self.fs.add_data_pool("foo")
-        self.mount_a.run_shell(["mkdir", "subdir"])
+        self.mount_a.run_shell("mkdir subdir")
         self.fs.set_dir_layout(self.mount_a, "subdir", FileLayout(pool=p))
 
     def test_add_data_pool_ec(self):
@@ -141,7 +140,7 @@ class TestConfigCommands(CephFSTestCase):
         """
 
         if not isinstance(self.mount_a, FuseMount):
-            raise case.SkipTest("Test only applies to FUSE clients")
+            self.skipTest("Test only applies to FUSE clients")
 
         test_key = "client_cache_size"
         test_val = "123"