summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-12-01 18:31:45 +0200
committerMart Raudsepp <leio@gentoo.org>2019-12-01 18:31:45 +0200
commit406b5c53c966d73fd068cb922fabc42c1c090cd9 (patch)
treefb231c4e9997386ba431ef244bb22898f4a9d38c /dev-python/dbusmock/files
parentwww-client/epiphany: remove old (diff)
downloadgentoo-406b5c53c966d73fd068cb922fabc42c1c090cd9.tar.gz
gentoo-406b5c53c966d73fd068cb922fabc42c1c090cd9.tar.bz2
gentoo-406b5c53c966d73fd068cb922fabc42c1c090cd9.zip
dev-python/dbusmock: remove old
Package-Manager: Portage-2.3.69, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'dev-python/dbusmock/files')
-rw-r--r--dev-python/dbusmock/files/0.16.9-disable-style-tests.patch14
-rw-r--r--dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch76
2 files changed, 0 insertions, 90 deletions
diff --git a/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch b/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
deleted file mode 100644
index cb7febdb4e53..000000000000
--- a/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-These tests are bound to fail dependending on QA tools updates
-
-https://github.com/martinpitt/python-dbusmock/issues/28
-
---- a/tests/test_code.py 2017-08-16 09:20:43.848503995 +0200
-+++ b/tests/test_code.py 2017-08-16 09:20:54.410177037 +0200
-@@ -21,6 +21,7 @@
- pycodestyle = None
-
-
-+@unittest.skip('style tests')
- class StaticCodeTests(unittest.TestCase):
- @unittest.skipIf(subprocess.call(['which', 'pyflakes'], stdout=subprocess.PIPE) != 0,
- 'pyflakes not installed')
diff --git a/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch b/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
deleted file mode 100644
index 54149ed033aa..000000000000
--- a/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9470c54a2836795974e83e55ea859e4653b20b37 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin@piware.de>
-Date: Mon, 19 Jun 2017 16:31:28 +0200
-Subject: [PATCH] Call dbus-daemon directly instead of dbus-launch
-
-dbus-launch is X11 specific and being deprecated.
-
-Adjust documentation to use dbus-run-session instead.
-
-https://bugs.debian.org/836053
----
- NEWS | 4 ++++
- README.rst | 6 +++---
- dbusmock/testcase.py | 18 ++++++++++--------
- 3 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index c1250ea..181a4df 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,7 @@
-+0.17 (UNRELEASED)
-+-----------------
-+ - Call dbus-daemon directly instead of dbus-launch. (Debian #836053)
-+
- 0.16.9 (2017-06-19)
- -------------------
- - NetworkManager template: Fix type of 'State' property in AddActiveConnection()
-diff --git a/README.rst b/README.rst
-index 3dc4552..310e1ac 100644
---- a/README.rst
-+++ b/README.rst
-@@ -118,9 +118,9 @@ Let's walk through:
- Simple example from shell
- -------------------------
-
--We use the actual session bus for this example. You can use ``dbus-launch`` to
--start a private one as well if you want, but that is not part of the actual
--mocking.
-+We use the actual session bus for this example. You can use
-+``dbus-run-session`` to start a private one as well if you want, but that is
-+not part of the actual mocking.
-
- So let's start a mock at the D-Bus name ``com.example.Foo`` with an initial
- "main" object on path /, with the main D-Bus interface
-diff --git a/dbusmock/testcase.py b/dbusmock/testcase.py
-index 825c61f..49787e2 100644
---- a/dbusmock/testcase.py
-+++ b/dbusmock/testcase.py
-@@ -97,16 +97,18 @@ def start_dbus(klass, conf=None):
- Normally you do not need to call this directly. Use start_system_bus()
- and start_session_bus() instead.
- '''
-- argv = ['dbus-launch']
-+ argv = ['dbus-daemon', '--fork', '--print-address=1', '--print-pid=1']
- if conf:
- argv.append('--config-file=' + conf)
-- out = subprocess.check_output(argv, universal_newlines=True)
-- variables = {}
-- for line in out.splitlines():
-- (k, v) = line.split('=', 1)
-- variables[k] = v
-- return (int(variables['DBUS_SESSION_BUS_PID']),
-- variables['DBUS_SESSION_BUS_ADDRESS'])
-+ else:
-+ argv.append('--session')
-+ lines = subprocess.check_output(argv, universal_newlines=True).strip().splitlines()
-+ assert len(lines) == 2, 'expected exactly 2 lines of output from dbus-daemon'
-+ # usually the first line is the address, but be lenient and accept any order
-+ try:
-+ return (int(lines[1]), lines[0])
-+ except ValueError:
-+ return (int(lines[0]), lines[1])
-
- @classmethod
- def stop_dbus(klass, pid):