[Pkg-ganeti-devel] [ganeti] 15/15: Revert "Disable a test under TestVerifyRestrictedCmdDirectory"

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos-guest pushed a commit to branch master
in repository ganeti.

commit 7211bc5a8fa7df32d4f101582d61b815df2af5eb
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Mon Sep 30 14:34:58 2013 +0300

    Revert "Disable a test under TestVerifyRestrictedCmdDirectory"
    
    Fix has been merged upstream.
---
 debian/changelog                                   |    2 --
 .../disable-TestVerifyRestrictedCmdDirectory.patch |   28 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39a05ca..683936c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,8 +48,6 @@ ganeti (2.7.1-1) unstable; urgency=low
     - 0001-daemon-util-pass-oknodo-at-rotate_logs.patch
     - 0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
     - fix-ganeti-cleaner-in-crontab.patch
-  * Add a new patch, disable-TestVerifyRestrictedCmdDirectory.patch, that
-    disables a test currently breaking build on the Debian buildd's
 
  -- Apollon Oikonomopoulos <apoikos at gmail.com>  Sun, 28 Jul 2013 04:59:44 +0300
 
diff --git a/debian/patches/disable-TestVerifyRestrictedCmdDirectory.patch b/debian/patches/disable-TestVerifyRestrictedCmdDirectory.patch
deleted file mode 100644
index 24b44c7..0000000
--- a/debian/patches/disable-TestVerifyRestrictedCmdDirectory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Apollon Oikonomopoulos <apoikos at gmail.com>
-Subject: Disable a test in ganeti.backend_unittest.py
-
-Disable the TestVerifyRestrictedCmdDirectory.testNormal, as it fails on the
-Debian buildds. We know that the code is good, since it builds correctly in a
-pristine chroot.
-
-Forwarded: No
-Last-Update: 2013-07-28
---- a/test/py/ganeti.backend_unittest.py
-+++ b/test/py/ganeti.backend_unittest.py
-@@ -164,16 +164,6 @@
-     self.assertFalse(status)
-     self.assertTrue(msg.endswith("is not a directory"))
- 
--  def testNormal(self):
--    tmpname = utils.PathJoin(self.tmpdir, "foobar")
--    os.mkdir(tmpname)
--    self.assertTrue(os.path.isdir(tmpname))
--    (status, msg) = \
--      backend._VerifyRestrictedCmdDirectory(tmpname,
--                                            _owner=_DefRestrictedCmdOwner())
--    self.assertTrue(status)
--    self.assertTrue(msg is None)
--
- 
- class TestVerifyRestrictedCmd(unittest.TestCase):
-   def setUp(self):
diff --git a/debian/patches/series b/debian/patches/series
index 2f2f409..7011cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
-disable-TestVerifyRestrictedCmdDirectory.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git