1 files changed, 0 insertions, 58 deletions
diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-remove-sandbox-failing-tests.patch b/app-emulation/ganeti/files/ganeti-2.15.2-remove-sandbox-failing-tests.patch
deleted file mode 100644
index bc79bbbcad29..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.15.2-remove-sandbox-failing-tests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/test/py/ganeti.hooks_unittest.py b/test/py/ganeti.hooks_unittest.py
-index 19d41bb..3382c7f 100755
---- a/test/py/ganeti.hooks_unittest.py
-+++ b/test/py/ganeti.hooks_unittest.py
-@@ -193,17 +193,17 @@ class TestHooksRunner(unittest.TestCase):
-       expect.sort()
-       self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, {}), expect)
- 
--  def testEnv(self):
--    """Test environment execution"""
--    for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
--      fbase = "success"
--      fname = "%s/%s" % (self.ph_dirs[phase], fbase)
--      os.symlink("/usr/bin/env", fname)
--      self.torm.append((fname, False))
--      env_snt = {"PHASE": phase}
--      env_exp = "PHASE=%s" % phase
--      self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
--                           [(self._rname(fname), HKR_SUCCESS, env_exp)])
-+  #def testEnv(self):
-+  #  """Test environment execution"""
-+  #  for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
-+  #    fbase = "success"
-+  #    fname = "%s/%s" % (self.ph_dirs[phase], fbase)
-+  #    os.symlink("/usr/bin/env", fname)
-+  #    self.torm.append((fname, False))
-+  #    env_snt = {"PHASE": phase}
-+  #    env_exp = "PHASE=%s" % phase
-+  #    self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
-+  #                         [(self._rname(fname), HKR_SUCCESS, env_exp)])
- 
- 
- def FakeHooksRpcSuccess(node_list, hpath, phase, env):
-diff --git a/test/py/ganeti.utils.process_unittest.py b/test/py/ganeti.utils.process_unittest.py
-index 82fc81e..4a59aa4 100755
---- a/test/py/ganeti.utils.process_unittest.py
-+++ b/test/py/ganeti.utils.process_unittest.py
-@@ -358,13 +358,13 @@ class TestRunCmd(testutils.GanetiTestCase):
-     cwd = os.getcwd()
-     self.failUnlessEqual(utils.RunCmd(["pwd"], cwd=cwd).stdout.strip(), cwd)
- 
--  def testResetEnv(self):
--    """Test environment reset functionality"""
--    self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True).stdout.strip(),
--                         "")
--    self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True,
--                                      env={"FOO": "bar",}).stdout.strip(),
--                         "FOO=bar")
-+  #def testResetEnv(self):
-+  #  """Test environment reset functionality"""
-+  #  self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True).stdout.strip(),
-+  #                       "")
-+  #  self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True,
-+  #                                    env={"FOO": "bar",}).stdout.strip(),
-+  #                       "FOO=bar")
- 
-   def testNoFork(self):
-     """Test that nofork raise an error"""