1 files changed, 0 insertions, 85 deletions
diff --git a/debian/patches/failing-tests.patch b/debian/patches/failing-tests.patch
deleted file mode 100644
index f871fde..0000000
--- a/debian/patches/failing-tests.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: Fix tests
- Various test fixes, and disabling of broken ones
-Author: Julian Andres Klode <julian.klode@canonical.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tests/test_lock.py
-+++ b/tests/test_lock.py
-@@ -74,7 +74,7 @@ class LockTest(unittest.TestCase):
-         # Lock!
-         aptdaemon.worker.aptworker.lock.status_lock.acquire()
-         self.assertEqual(2, subprocess.call(self.dpkg_cmd, env=self.env))
--        self.assertEqual(100, subprocess.call(self.apt_cmd, env=self.env,
-+        self.assertEqual(0, subprocess.call(self.apt_cmd, env=self.env,
-                          shell=True))
-         # Relase and all should work again!
-         aptdaemon.worker.aptworker.lock.status_lock.release()
-@@ -105,7 +105,7 @@ class LockTest(unittest.TestCase):
-         # Dpkg and apt-get doen't care about the lock as long as there aren't
-         # any downloads required
-         self.assertEqual(0, subprocess.call(self.dpkg_cmd, env=self.env))
--        self.assertEqual(0, subprocess.call(self.apt_cmd, env=self.env,
-+        self.assertEqual(100, subprocess.call(self.apt_cmd, env=self.env,
-                          shell=True))
-         self.assertEqual(100, subprocess.call(self.inst_cmd, env=self.env,
-                          shell=True))
---- a/tests/test_pep8.py
-+++ b/tests/test_pep8.py
-@@ -26,6 +26,7 @@ import subprocess
- import unittest
- 
- 
-+@unittest.skip("Does not work")
- class AptDaemonPep8TestCase(unittest.TestCase):
- 
-     def test(self):
---- a/tests/test_pk.py
-+++ b/tests/test_pk.py
-@@ -34,6 +34,7 @@ REPO_PATH = os.path.join(aptdaemon.test.
- DEBUG = True
- 
- 
-+@unittest.skip("Removed PackageKit compat")
- class PackageKitTest(aptdaemon.test.AptDaemonTestCase):
- 
-     """Test the PackageKit compatibility layer."""
---- a/tests/test_progress.py
-+++ b/tests/test_progress.py
-@@ -8,11 +8,17 @@ import mock
- import sys
- import unittest
- 
-+import aptdaemon.test
- from aptdaemon.progress import DaemonOpenProgress
- 
- 
- class TestProgress(unittest.TestCase):
- 
-+    def setUp(self):
-+        self.chroot = aptdaemon.test.Chroot()
-+        self.chroot.setup()
-+        self.addCleanup(self.chroot.remove)
-+
-     def test_open_progress(self):
-         transaction = mock.Mock()
-         begin = 0
---- a/aptdaemon/test.py
-+++ b/aptdaemon/test.py
-@@ -75,6 +75,7 @@ class Chroot(object):
-         os.makedirs(os.path.join(self.path, "etc/apt/apt.conf.d"))
-         os.makedirs(os.path.join(self.path, "etc/apt/sources.list.d"))
-         os.makedirs(os.path.join(self.path, "etc/apt/preferences.d"))
-+        os.makedirs(os.path.join(self.path, "etc/apt/trusted.gpg.d"))
-         os.makedirs(os.path.join(self.path, "var/log"))
-         os.makedirs(os.path.join(self.path, "media"))
- 
---- a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -77,6 +77,7 @@ class ClientTest(aptdaemon.test.AptDaemo
-         self.chroot.setup()
-         self.addCleanup(self.chroot.remove)
-         self.chroot.add_test_repository()
-+        self.chroot.add_trusted_key()
-         # Start aptdaemon with the chroot on the session bus
-         self.start_dbus_daemon()
-         self.bus = dbus.bus.BusConnection(self.dbus_address)