Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-dbus-python for openSUSE:Factory checked in at 2021-01-15 19:43:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-dbus-python (Old) and /work/SRC/openSUSE:Factory/.python-dbus-python.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dbus-python" Fri Jan 15 19:43:42 2021 rev:9 rq:861986 version:1.2.16 Changes: -------- --- /work/SRC/openSUSE:Factory/python-dbus-python/python-dbus-python.changes 2020-12-16 10:59:04.351486496 +0100 +++ /work/SRC/openSUSE:Factory/.python-dbus-python.new.28504/python-dbus-python.changes 2021-01-15 19:43:43.513789715 +0100 @@ -1,0 +2,8 @@ +Sat Jan 9 16:16:55 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 1.2.16: + * All tests are run even if the tap.py module is not available, although + diagnostics for failing tests will be better if it is present. + * Forbid unexpanded AX-prefixed macros more selectively + +------------------------------------------------------------------- Old: ---- dbus-python-1.2.14.tar.gz dbus-python-1.2.14.tar.gz.asc New: ---- dbus-python-1.2.16.tar.gz dbus-python-1.2.16.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dbus-python.spec ++++++ --- /var/tmp/diff_new_pack.4xwNqC/_old 2021-01-15 19:43:44.257790934 +0100 +++ /var/tmp/diff_new_pack.4xwNqC/_new 2021-01-15 19:43:44.261790941 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-dbus-python # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +# expand separate from Provides/Obsoletes tags, because these are later duplicated by the python_subpackages macro +%define python_add_provides %{python_provides} Name: python-dbus-python -Version: 1.2.14 +Version: 1.2.16 Release: 0 Summary: Python bindings for D-Bus License: MIT Group: Development/Libraries/Python -URL: http://www.freedesktop.org/wiki/Software/DBusBindings/ -Source: http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz -Source2: http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz.asc +URL: https://www.freedesktop.org/wiki/Software/DBusBindings/ +Source: https://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz +Source2: https://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz.asc Source99: python-dbus-python-rpmlintrc BuildRequires: %{python_module devel} BuildRequires: %{python_module docutils} @@ -41,8 +43,6 @@ %requires_ge dbus-1 Provides: dbus-1-%{python_flavor} = %{version} Obsoletes: dbus-1-%{python_flavor} < %{version} -# expand separate from Provides/Obsoletes tags, because these are later duplicated by the python_subpackages macro -%define python_add_provides %{python_provides} %if "%{?python_provides}" != "" # additional provider for python2 --> python and python38 --> python3 Provides: dbus-1-%{python_add_provides} = %{version} @@ -64,9 +64,9 @@ Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: %{name}-common-devel = %{version} +Requires: python-devel %requires_ge dbus-1 %requires_ge dbus-1-devel -Requires: python-devel Provides: dbus-1-%{python_flavor}-devel = %{version} Obsoletes: dbus-1-%{python_flavor}-devel < %{version} %if "%{?python_provides}" != "" @@ -106,7 +106,7 @@ # Remove Makefile* (fix rpmlint warning "makefile-junk") rm -f examples/Makefile* # Remove shebang from examples -sed -i '1 {\|^#!/usr/bin/env| d}' examples/*.py +sed -i '1 {\|^#!%{_bindir}/env| d}' examples/*.py %build export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing -fPIC" @@ -116,7 +116,7 @@ pushd build_%{$python_bin_suffix} %configure PYTHON=%{_bindir}/$python -make %{?_smp_mflags} +%make_build popd ++++++ dbus-python-1.2.14.tar.gz -> dbus-python-1.2.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/.version new/dbus-python-1.2.16/.version --- old/dbus-python-1.2.14/.version 2019-11-25 20:12:41.000000000 +0100 +++ new/dbus-python-1.2.16/.version 2020-01-14 10:29:16.000000000 +0100 @@ -1 +1 @@ -1.2.14 +1.2.16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/MANIFEST new/dbus-python-1.2.16/MANIFEST --- old/dbus-python-1.2.14/MANIFEST 2019-11-25 20:12:42.000000000 +0100 +++ new/dbus-python-1.2.16/MANIFEST 2020-01-14 10:29:16.000000000 +0100 @@ -150,6 +150,7 @@ test/cross-test-server.py test/crosstest.py test/dbus_py_test.c +test/dbus_test_utils.py test/import-repeatedly.c test/run-test.sh test/test-client.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/MANIFEST.in new/dbus-python-1.2.16/MANIFEST.in --- old/dbus-python-1.2.14/MANIFEST.in 2019-11-25 20:12:42.000000000 +0100 +++ new/dbus-python-1.2.16/MANIFEST.in 2020-01-14 10:29:16.000000000 +0100 @@ -150,6 +150,7 @@ include test/cross-test-server.py include test/crosstest.py include test/dbus_py_test.c +include test/dbus_test_utils.py include test/import-repeatedly.c include test/run-test.sh include test/test-client.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/Makefile.am new/dbus-python-1.2.16/Makefile.am --- old/dbus-python-1.2.14/Makefile.am 2019-09-12 11:06:43.000000000 +0200 +++ new/dbus-python-1.2.16/Makefile.am 2020-01-11 12:45:18.000000000 +0100 @@ -248,6 +248,7 @@ dist_test_extra_python = \ test/crosstest.py \ + test/dbus_test_utils.py \ $(NULL) dist_test_extra_scripts = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/Makefile.in new/dbus-python-1.2.16/Makefile.in --- old/dbus-python-1.2.14/Makefile.in 2019-11-25 20:09:53.000000000 +0100 +++ new/dbus-python-1.2.16/Makefile.in 2020-01-14 10:22:12.000000000 +0100 @@ -335,7 +335,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__nobase_dist_installed_test_PYTHON_DIST = test/crosstest.py +am__nobase_dist_installed_test_PYTHON_DIST = test/crosstest.py \ + test/dbus_test_utils.py am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__pep3147_tweak = \ sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' @@ -936,6 +937,7 @@ $(am__append_5) dist_test_extra_python = \ test/crosstest.py \ + test/dbus_test_utils.py \ $(NULL) dist_test_extra_scripts = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/NEWS new/dbus-python-1.2.16/NEWS --- old/dbus-python-1.2.14/NEWS 2019-11-25 20:09:19.000000000 +0100 +++ new/dbus-python-1.2.16/NEWS 2020-01-14 10:15:23.000000000 +0100 @@ -1,3 +1,19 @@ +dbus Python Bindings 1.2.16 (2020-01-14) +======================================== + +The ???bag of assorted swords??? release. + +Enhancements: + +??? All tests are run even if the tap.py module is not available, although + diagnostics for failing tests will be better if it is present. + (Simon McVittie) + +Fixes: + +??? Forbid unexpanded AX-prefixed macros more selectively, similar to + dbus#249. (Simon McVittie) + dbus Python Bindings 1.2.14 (2019-11-25) ======================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/PKG-INFO new/dbus-python-1.2.16/PKG-INFO --- old/dbus-python-1.2.14/PKG-INFO 2019-11-25 20:12:42.000000000 +0100 +++ new/dbus-python-1.2.16/PKG-INFO 2020-01-14 10:29:16.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: dbus-python -Version: 1.2.14 +Version: 1.2.16 Summary: Python bindings for libdbus Home-page: http://www.freedesktop.org/wiki/Software/DBusBindings/#python Maintainer: The D-Bus maintainers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/configure new/dbus-python-1.2.16/configure --- old/dbus-python-1.2.14/configure 2019-11-25 20:09:53.000000000 +0100 +++ new/dbus-python-1.2.16/configure 2020-01-14 10:22:11.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dbus-python 1.2.14. +# Generated by GNU Autoconf 2.69 for dbus-python 1.2.16. # # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=python>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='dbus-python' PACKAGE_TARNAME='dbus-python' -PACKAGE_VERSION='1.2.14' -PACKAGE_STRING='dbus-python 1.2.14' +PACKAGE_VERSION='1.2.16' +PACKAGE_STRING='dbus-python 1.2.16' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=python' PACKAGE_URL='' @@ -1387,7 +1387,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dbus-python 1.2.14 to adapt to many kinds of systems. +\`configure' configures dbus-python 1.2.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1458,7 +1458,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dbus-python 1.2.14:";; + short | recursive ) echo "Configuration of dbus-python 1.2.16:";; esac cat <<\_ACEOF @@ -1610,7 +1610,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dbus-python configure 1.2.14 +dbus-python configure 1.2.16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1979,7 +1979,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dbus-python $as_me 1.2.14, which was +It was created by dbus-python $as_me 1.2.16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2450,9 +2450,9 @@ DBUS_PYTHON_MINOR_VERSION=2 -$as_echo "#define DBUS_PYTHON_MICRO_VERSION 14" >>confdefs.h +$as_echo "#define DBUS_PYTHON_MICRO_VERSION 16" >>confdefs.h -DBUS_PYTHON_MICRO_VERSION=14 +DBUS_PYTHON_MICRO_VERSION=16 @@ -4276,7 +4276,7 @@ # Define the identity of the package. PACKAGE='dbus-python' - VERSION='1.2.14' + VERSION='1.2.16' cat >>confdefs.h <<_ACEOF @@ -15665,7 +15665,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dbus-python $as_me 1.2.14, which was +This file was extended by dbus-python $as_me 1.2.16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15731,7 +15731,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dbus-python config.status 1.2.14 +dbus-python config.status 1.2.16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/configure.ac new/dbus-python-1.2.16/configure.ac --- old/dbus-python-1.2.14/configure.ac 2019-11-25 20:09:25.000000000 +0100 +++ new/dbus-python-1.2.16/configure.ac 2020-01-14 10:15:32.000000000 +0100 @@ -5,7 +5,7 @@ m4_define(dbus_python_major_version, 1) m4_define(dbus_python_minor_version, 2) dnl Micro version is odd for non-releases -m4_define(dbus_python_micro_version, 14) +m4_define(dbus_python_micro_version, 16) AC_INIT([dbus-python], dbus_python_major_version.dbus_python_minor_version.dbus_python_micro_version, @@ -14,7 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_CONFIG_AUX_DIR([build-aux]) -m4_pattern_forbid([^AX_], +m4_pattern_forbid([^AX_(COMPILER_FLAGS|IS_RELEASE|PYTHON_DEVEL|PYTHON_MODULE)\b], [Unexpanded AX_ macro found. Please install GNU autoconf-archive]) # By default, rebuild autotools files on demand; only use ./missing if the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/dbus_python.egg-info/PKG-INFO new/dbus-python-1.2.16/dbus_python.egg-info/PKG-INFO --- old/dbus-python-1.2.14/dbus_python.egg-info/PKG-INFO 2019-11-25 20:12:41.000000000 +0100 +++ new/dbus-python-1.2.16/dbus_python.egg-info/PKG-INFO 2020-01-14 10:29:16.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: dbus-python -Version: 1.2.14 +Version: 1.2.16 Summary: Python bindings for libdbus Home-page: http://www.freedesktop.org/wiki/Software/DBusBindings/#python Maintainer: The D-Bus maintainers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/dbus_python.egg-info/SOURCES.txt new/dbus-python-1.2.16/dbus_python.egg-info/SOURCES.txt --- old/dbus-python-1.2.14/dbus_python.egg-info/SOURCES.txt 2019-11-25 20:12:42.000000000 +0100 +++ new/dbus-python-1.2.16/dbus_python.egg-info/SOURCES.txt 2020-01-14 10:29:16.000000000 +0100 @@ -150,6 +150,7 @@ test/cross-test-server.py test/crosstest.py test/dbus_py_test.c +test/dbus_test_utils.py test/import-repeatedly.c test/run-test.sh test/test-client.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/dbus_test_utils.py new/dbus-python-1.2.16/test/dbus_test_utils.py --- old/dbus-python-1.2.14/test/dbus_test_utils.py 1970-01-01 01:00:00.000000000 +0100 +++ new/dbus-python-1.2.16/test/dbus_test_utils.py 2020-01-11 12:45:18.000000000 +0100 @@ -0,0 +1,53 @@ +# Copyright 2020 Simon McVittie +# +# SPDX-License-Identifier: MIT +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, copy, +# modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +from __future__ import print_function + +import unittest + +try: + from tap.runner import TAPTestRunner +except ImportError: + TAPTestRunner = None # type: ignore + +def main(): + # type: (...) -> None + if TAPTestRunner is not None: + runner = TAPTestRunner() + runner.set_stream(True) + unittest.main(testRunner=runner) + else: + # You thought pycotap was a minimal TAP implementation? + print('1..1') + program = unittest.main(exit=False) + if program.result.wasSuccessful(): + print( + 'ok 1 - %r (tap module not available)' + % program.result + ) + else: + print( + 'not ok 1 - %r (tap module not available)' + % program.result + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/test-client.py new/dbus-python-1.2.16/test/test-client.py --- old/dbus-python-1.2.14/test/test-client.py 2019-09-12 11:07:11.000000000 +0200 +++ new/dbus-python-1.2.16/test/test-client.py 2020-01-11 12:45:18.000000000 +0100 @@ -32,17 +32,12 @@ import logging import weakref -try: - from tap.runner import TAPTestRunner -except ImportError: - print('1..0 # SKIP cannot import TAPTestRunner') - raise SystemExit(0) - import dbus import _dbus_bindings import dbus.glib import dbus.lowlevel import dbus.service +import dbus_test_utils from dbus._compat import is_py2, is_py3 @@ -693,6 +688,4 @@ gobject.threads_init() dbus.glib.init_threads() - runner = TAPTestRunner() - runner.set_stream(True) - unittest.main(testRunner=runner) + dbus_test_utils.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/test-exception-py2.py new/dbus-python-1.2.16/test/test-exception-py2.py --- old/dbus-python-1.2.14/test/test-exception-py2.py 2019-09-12 11:03:47.000000000 +0200 +++ new/dbus-python-1.2.16/test/test-exception-py2.py 2020-01-11 12:45:18.000000000 +0100 @@ -6,13 +6,8 @@ import sys import unittest -try: - from tap.runner import TAPTestRunner -except ImportError: - print('1..0 # SKIP cannot import TAPTestRunner') - raise SystemExit(0) - import dbus +import dbus_test_utils # from test-service.py class ServiceError(dbus.DBusException): @@ -67,6 +62,4 @@ if __name__ == "__main__": - runner = TAPTestRunner() - runner.set_stream(True) - unittest.main(testRunner=runner) + dbus_test_utils.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/test-exception-py3.py new/dbus-python-1.2.16/test/test-exception-py3.py --- old/dbus-python-1.2.14/test/test-exception-py3.py 2019-09-12 11:03:47.000000000 +0200 +++ new/dbus-python-1.2.16/test/test-exception-py3.py 2020-01-11 12:45:18.000000000 +0100 @@ -5,13 +5,8 @@ import unittest -try: - from tap.runner import TAPTestRunner -except ImportError: - print('1..0 # SKIP cannot import TAPTestRunner') - raise SystemExit(0) - import dbus +import dbus_test_utils # from test-service.py class ServiceError(dbus.DBusException): @@ -36,6 +31,4 @@ if __name__ == "__main__": - runner = TAPTestRunner() - runner.set_stream(True) - unittest.main(testRunner=runner) + dbus_test_utils.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/test-p2p.py new/dbus-python-1.2.16/test/test-p2p.py --- old/dbus-python-1.2.14/test/test-p2p.py 2019-09-12 11:06:43.000000000 +0200 +++ new/dbus-python-1.2.16/test/test-p2p.py 2020-01-11 12:45:18.000000000 +0100 @@ -35,16 +35,11 @@ import dbus.glib import dbus.service import dbus.types +import dbus_test_utils from dbus._compat import is_py2 try: - from tap.runner import TAPTestRunner -except ImportError: - print('1..0 # SKIP cannot import TAPTestRunner') - raise SystemExit(0) - -try: from gi.repository import GObject as gobject except ImportError: print('1..0 # SKIP cannot import GObject') @@ -131,6 +126,4 @@ gobject.threads_init() dbus.glib.init_threads() - runner = TAPTestRunner() - runner.set_stream(True) - unittest.main(testRunner=runner) + dbus_test_utils.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/test-signals.py new/dbus-python-1.2.16/test/test-signals.py --- old/dbus-python-1.2.14/test/test-signals.py 2019-09-12 11:03:47.000000000 +0200 +++ new/dbus-python-1.2.16/test/test-signals.py 2020-01-11 12:45:18.000000000 +0100 @@ -35,12 +35,7 @@ import _dbus_bindings import dbus.glib import dbus.service - -try: - from tap.runner import TAPTestRunner -except ImportError: - print('1..0 # SKIP cannot import TAPTestRunner') - raise SystemExit(0) +import dbus_test_utils try: from gi.repository import GObject as gobject @@ -170,6 +165,4 @@ dbus.glib.init_threads() logger.info('Starting unit test') - runner = TAPTestRunner() - runner.set_stream(True) - unittest.main(testRunner=runner) + dbus_test_utils.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/test-standalone.py new/dbus-python-1.2.16/test/test-standalone.py --- old/dbus-python-1.2.14/test/test-standalone.py 2019-11-25 19:54:58.000000000 +0100 +++ new/dbus-python-1.2.16/test/test-standalone.py 2020-01-11 12:45:18.000000000 +0100 @@ -35,16 +35,11 @@ import os import unittest -try: - from tap.runner import TAPTestRunner -except ImportError: - print('1..0 # SKIP cannot import TAPTestRunner') - raise SystemExit(0) - import _dbus_bindings import dbus import dbus.lowlevel as lowlevel import dbus.types as types +import dbus_test_utils from dbus._compat import is_py2, is_py3 if is_py3: @@ -653,6 +648,4 @@ self.assertLess(dbus.__version__, '9') if __name__ == '__main__': - runner = TAPTestRunner() - runner.set_stream(True) - unittest.main(testRunner=runner, verbosity=2) + dbus_test_utils.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-python-1.2.14/test/test-unusable-main-loop.py new/dbus-python-1.2.16/test/test-unusable-main-loop.py --- old/dbus-python-1.2.14/test/test-unusable-main-loop.py 2019-09-12 11:03:47.000000000 +0200 +++ new/dbus-python-1.2.16/test/test-unusable-main-loop.py 2020-01-11 12:45:18.000000000 +0100 @@ -28,13 +28,8 @@ import unittest -try: - from tap.runner import TAPTestRunner -except ImportError: - print('1..0 # SKIP cannot import TAPTestRunner') - raise SystemExit(0) - import dbus +import dbus_test_utils from dbus_py_test import UnusableMainLoop @@ -44,6 +39,4 @@ self.assertRaises(ValueError, lambda: dbus.SessionBus()) if __name__ == '__main__': - runner = TAPTestRunner() - runner.set_stream(True) - unittest.main(testRunner=runner) + dbus_test_utils.main()