1 files changed, 0 insertions, 59 deletions
diff --git a/app-emulation/ganeti/files/ganeti-2.12-tests.patch b/app-emulation/ganeti/files/ganeti-2.12-tests.patch
deleted file mode 100644
index dcf9b5184a0b..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.12-tests.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/test/hs/Test/Ganeti/Runtime.hs b/test/hs/Test/Ganeti/Runtime.hs
-index b15aa36..a805869 100644
---- a/test/hs/Test/Ganeti/Runtime.hs
-+++ b/test/hs/Test/Ganeti/Runtime.hs
-@@ -126,10 +126,6 @@ case_UsersGroups = do
-     (length py_users) (length users)
-   assertEqual "Mismatch in number of returned users"
-     (length py_groups) (length groups)
--  mapM_ (uncurry (assertEqual "Different result for users")
--        ) $ zip users py_users
--  mapM_ (uncurry (assertEqual "Different result for groups")
--        ) $ zip groups py_groups
- 
- testSuite "Runtime"
-           [ 'case_LogFiles
-diff --git a/test/py/daemon-util_unittest.bash b/test/py/daemon-util_unittest.bash
-index edaeac5..1ee6eae 100755
---- a/test/py/daemon-util_unittest.bash
-+++ b/test/py/daemon-util_unittest.bash
-@@ -45,8 +45,8 @@ if ! grep -q '^ENABLE_MOND = ' lib/_constants.py; then
-   err "Please update $0, mond enable feature is missing"
- fi
- 
--DAEMONS_LIST="noded wconfd rapi luxid kvmd"
--STOPDAEMONS_LIST="kvmd luxid rapi wconfd noded"
-+DAEMONS_LIST="noded wconfd kvmd"
-+STOPDAEMONS_LIST="kvmd wconfd noded"
- 
- if grep -q '^ENABLE_CONFD = True' lib/_constants.py; then
-   DAEMONS_LIST="$DAEMONS_LIST confd"
-diff --git a/test/py/ganeti.utils.process_unittest.py b/test/py/ganeti.utils.process_unittest.py
-index 7d4cbb6..08752fe 100755
---- a/test/py/ganeti.utils.process_unittest.py
-+++ b/test/py/ganeti.utils.process_unittest.py
-@@ -274,7 +274,7 @@ class TestRunCmd(testutils.GanetiTestCase):
-     result = utils.RunCmd(["/bin/sh", "-c", cmd], timeout=0.2,
-                           noclose_fds=[self.proc_ready_helper.write_fd],
-                           postfork_fn=self.proc_ready_helper.Ready)
--    self.assertEqual(result.exit_code, 0)
-+    self.assertEqual(result.exit_code, None)
- 
-   def testTimeoutKill(self):
-     cmd = ["/bin/sh", "-c", "trap '' TERM; echo >&%d; read < %s" %
-@@ -289,15 +289,6 @@ class TestRunCmd(testutils.GanetiTestCase):
-     self.assert_(status < 0)
-     self.assertEqual(-status, signal.SIGKILL)
- 
--  def testTimeoutOutputAfterTerm(self):
--    cmd = ("trap 'echo sigtermed; exit 1' TERM; echo >&%d; read < %s" %
--           (self.proc_ready_helper.write_fd, self.fifo_file))
--    result = utils.RunCmd(["/bin/sh", "-c", cmd], timeout=0.2,
--                          noclose_fds=[self.proc_ready_helper.write_fd],
--                          postfork_fn=self.proc_ready_helper.Ready)
--    self.assert_(result.failed)
--    self.assertEqual(result.stdout, "sigtermed\n")
--
-   def testListRun(self):
-     """Test list runs"""
-     result = utils.RunCmd(["true"])