Change internal RPC client body values

[ganeti-local] / test / ganeti.tools.ensure_dirs_unittest.py

diff --git a/test/ganeti.tools.ensure_dirs_unittest.py b/test/ganeti.tools.ensure_dirs_unittest.py
index 999da06..48700e9 100755 (executable)
--- a/test/ganeti.tools.ensure_dirs_unittest.py
+++ b/test/ganeti.tools.ensure_dirs_unittest.py
@@ -21,8 +21,6 @@
 
 """Script for testing ganeti.tools.ensure_dirs"""
 
-import errno
-import stat
 import unittest
 import os.path
 
@@ -32,91 +30,6 @@ import testutils
 
 
 class TestEnsureDirsFunctions(unittest.TestCase):
-  def _NoopMkdir(self, _):
-    self.mkdir_called = True
-
-  @staticmethod
-  def _MockStatResult(mode, pre_fn=lambda: 0):
-    def _fn(path):
-      pre_fn()
-      return {stat.ST_MODE: mode}
-    return _fn
-
-  def _VerifyEnsure(self, path, mode, uid=-1, gid=-1):
-    self.assertEqual(path, "/ganeti-qa-non-test")
-    self.assertEqual(mode, 0700)
-    self.assertEqual(uid, 0)
-    self.assertEqual(gid, 0)
-
-  @staticmethod
-  def _RaiseNoEntError():
-    noent_error = EnvironmentError()
-    noent_error.errno = errno.ENOENT
-    raise noent_error
-
-  @staticmethod
-  def _OtherStatRaise():
-    raise EnvironmentError()
-
-  def _ChmodWrapper(self, pre_fn=lambda: 0):
-    def _fn(path, mode):
-      self.chmod_called = True
-      pre_fn()
-    return _fn
-
-  def _NoopChown(self, path, uid, gid):
-    self.chown_called = True
-
-  def testEnsureDir(self):
-    is_dir_stat = self._MockStatResult(stat.S_IFDIR)
-    not_dir_stat = self._MockStatResult(0)
-    non_exist_stat = self._MockStatResult(stat.S_IFDIR,
-                                          pre_fn=self._RaiseNoEntError)
-    other_stat_raise = self._MockStatResult(stat.S_IFDIR,
-                                            pre_fn=self._OtherStatRaise)
-
-    self.assertRaises(ensure_dirs.EnsureError, ensure_dirs.EnsureDir,
-                      "/ganeti-qa-non-test", 0700, 0, 0,
-                      _lstat_fn=not_dir_stat)
-    self.assertRaises(ensure_dirs.EnsureError, ensure_dirs.EnsureDir,
-                      "/ganeti-qa-non-test", 0700, 0, 0,
-                      _lstat_fn=other_stat_raise)
-    self.mkdir_called = False
-    ensure_dirs.EnsureDir("/ganeti-qa-non-test", 0700, 0, 0,
-                          _lstat_fn=non_exist_stat, _mkdir_fn=self._NoopMkdir,
-                          _ensure_fn=self._VerifyEnsure)
-    self.assertTrue(self.mkdir_called)
-    self.mkdir_called = False
-    ensure_dirs.EnsureDir("/ganeti-qa-non-test", 0700, 0, 0,
-                          _lstat_fn=is_dir_stat, _ensure_fn=self._VerifyEnsure)
-    self.assertFalse(self.mkdir_called)
-
-  def testEnsurePermission(self):
-    noent_chmod_fn = self._ChmodWrapper(pre_fn=self._RaiseNoEntError)
-    self.assertRaises(ensure_dirs.EnsureError, ensure_dirs.EnsurePermission,
-                      "/ganeti-qa-non-test", 0600,
-                      _chmod_fn=noent_chmod_fn)
-    self.chmod_called = False
-    ensure_dirs.EnsurePermission("/ganeti-qa-non-test", 0600, must_exist=False,
-                                 _chmod_fn=noent_chmod_fn)
-    self.assertTrue(self.chmod_called)
-    self.assertRaises(ensure_dirs.EnsureError, ensure_dirs.EnsurePermission,
-                      "/ganeti-qa-non-test", 0600, must_exist=False,
-                      _chmod_fn=self._ChmodWrapper(pre_fn=self._OtherStatRaise))
-    self.chmod_called = False
-    self.chown_called = False
-    ensure_dirs.EnsurePermission("/ganeti-qa-non-test", 0600,
-                                 _chmod_fn=self._ChmodWrapper(),
-                                 _chown_fn=self._NoopChown)
-    self.assertTrue(self.chmod_called)
-    self.assertFalse(self.chown_called)
-    self.chmod_called = False
-    ensure_dirs.EnsurePermission("/ganeti-qa-non-test", 0600, uid=1, gid=1,
-                                 _chmod_fn=self._ChmodWrapper(),
-                                 _chown_fn=self._NoopChown)
-    self.assertTrue(self.chmod_called)
-    self.assertTrue(self.chown_called)
-
   def testPaths(self):
     paths = [(path[0], path[1]) for path in ensure_dirs.GetPaths()]