[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.7.0-1-54-g1fd06ae

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit 318c1896b053d57e0e5283ae1845758e8f17576d
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Sun Jul 28 12:56:59 2013 +0300

    Disable a test under TestVerifyRestrictedCmdDirectory
    
    The test fails in the Debian buildds. We have no indication that there is a
    coding error, so it's probably something buildd-specific that will have to be
    researched manually.

diff --git a/debian/changelog b/debian/changelog
index f84957f..7f47af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ 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
new file mode 100644
index 0000000..24b44c7
--- /dev/null
+++ b/debian/patches/disable-TestVerifyRestrictedCmdDirectory.patch
@@ -0,0 +1,28 @@
+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 7011cb7..2f2f409 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
+disable-TestVerifyRestrictedCmdDirectory.patch

-- 
Ganeti packaging