Your message dated Sat, 12 Sep 2015 10:28:54 +0200
with message-id <[email protected]>
and subject line Closing this bug
has caused the Debian Bug report #791930,
regarding python-taskflow: Resync with Ubuntu
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
791930: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791930
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: python-taskflow
Version: 0.7.1-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu wily ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Resync with Debian unstable, remaining changes:
- d/control,d/tests/*: Add autopkgtests.
- d/p/disable-kombu-3-test.patch: Dropped, kombu3 is in archive.
- d/p/fix-requirements.patch: Added, drop requirement on ordereddict.
There are a few useful bits in the diff - specifically some patch management
now kombu 3 is in Debian/Ubuntu and some autopkgtests.
Thanks for considering the patch.
-- System Information:
Debian Release: jessie/sid
APT prefers wily-updates
APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'),
(100, 'wily-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.0.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-taskflow-0.7.1/debian/control python-taskflow-0.7.1/debian/control
--- python-taskflow-0.7.1/debian/control 2015-04-28 14:40:51.000000000 +0100
+++ python-taskflow-0.7.1/debian/control 2015-07-09 17:01:18.000000000 +0100
@@ -38,6 +38,7 @@
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-taskflow.git
Vcs-Git: git://anonscm.debian.org/openstack/python-taskflow.git
Homepage: https://github.com/openstack/taskflow
+XS-Testsuite: autopkgtest
Package: python-taskflow
Architecture: all
diff -Nru python-taskflow-0.7.1/debian/patches/disable-kombu-3-test.patch python-taskflow-0.7.1/debian/patches/disable-kombu-3-test.patch
--- python-taskflow-0.7.1/debian/patches/disable-kombu-3-test.patch 2015-04-28 14:40:51.000000000 +0100
+++ python-taskflow-0.7.1/debian/patches/disable-kombu-3-test.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,94 +0,0 @@
-Description: Disable test that requires Kombu 3.x
- The file taskflow/tests/unit/worker_based/test_dispatcher.py is trying to
- do "from kombu import message", which is only in Kombu 3.x. Juno is to be
- released with Kombu 2.5.x, which doesn't include a message.py file, so the
- unit tests are failing.
- .
- This patch neutralise the test cases, which otherwise pass.
-Author: Thomas Goirand <[email protected]>
-Forwarded: no
-Last-Update: 2015-02-10
-
---- a/taskflow/tests/unit/worker_based/test_dispatcher.py 2015-02-10 15:58:00.000000000 +0100
-+++ /dev/null 2015-02-06 22:50:20.582883760 +0100
-@@ -1,80 +0,0 @@
--# -*- coding: utf-8 -*-
--
--# Copyright (C) 2014 Yahoo! Inc. All Rights Reserved.
--#
--# Licensed under the Apache License, Version 2.0 (the "License"); you may
--# not use this file except in compliance with the License. You may obtain
--# a copy of the License at
--#
--# http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
--# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
--# License for the specific language governing permissions and limitations
--# under the License.
--
--try:
-- from kombu import message # noqa
--except ImportError:
-- from kombu.transport import base as message
--
--from taskflow.engines.worker_based import dispatcher
--from taskflow import test
--from taskflow.test import mock
--
--
--def mock_acked_message(ack_ok=True, **kwargs):
-- msg = mock.create_autospec(message.Message, spec_set=True, instance=True,
-- channel=None, **kwargs)
--
-- def ack_side_effect(*args, **kwargs):
-- msg.acknowledged = True
--
-- if ack_ok:
-- msg.ack_log_error.side_effect = ack_side_effect
-- msg.acknowledged = False
-- return msg
--
--
--class TestDispatcher(test.TestCase):
-- def test_creation(self):
-- on_hello = mock.MagicMock()
-- handlers = {'hello': on_hello}
-- dispatcher.TypeDispatcher(type_handlers=handlers)
--
-- def test_on_message(self):
-- on_hello = mock.MagicMock()
-- handlers = {'hello': on_hello}
-- d = dispatcher.TypeDispatcher(type_handlers=handlers)
-- msg = mock_acked_message(properties={'type': 'hello'})
-- d.on_message("", msg)
-- self.assertTrue(on_hello.called)
-- self.assertTrue(msg.ack_log_error.called)
-- self.assertTrue(msg.acknowledged)
--
-- def test_on_rejected_message(self):
-- d = dispatcher.TypeDispatcher()
-- msg = mock_acked_message(properties={'type': 'hello'})
-- d.on_message("", msg)
-- self.assertTrue(msg.reject_log_error.called)
-- self.assertFalse(msg.acknowledged)
--
-- def test_on_requeue_message(self):
-- d = dispatcher.TypeDispatcher()
-- d.requeue_filters.append(lambda data, message: True)
-- msg = mock_acked_message()
-- d.on_message("", msg)
-- self.assertTrue(msg.requeue.called)
-- self.assertFalse(msg.acknowledged)
--
-- def test_failed_ack(self):
-- on_hello = mock.MagicMock()
-- handlers = {'hello': on_hello}
-- d = dispatcher.TypeDispatcher(type_handlers=handlers)
-- msg = mock_acked_message(ack_ok=False,
-- properties={'type': 'hello'})
-- d.on_message("", msg)
-- self.assertTrue(msg.ack_log_error.called)
-- self.assertFalse(msg.acknowledged)
-- self.assertFalse(on_hello.called)
diff -Nru python-taskflow-0.7.1/debian/patches/fix-requirements.patch python-taskflow-0.7.1/debian/patches/fix-requirements.patch
--- python-taskflow-0.7.1/debian/patches/fix-requirements.patch 1970-01-01 01:00:00.000000000 +0100
+++ python-taskflow-0.7.1/debian/patches/fix-requirements.patch 2015-07-09 16:52:04.000000000 +0100
@@ -0,0 +1,13 @@
+diff -Naurp taskflow-0.7.1.orig/requirements-py2.txt taskflow-0.7.1/requirements-py2.txt
+--- taskflow-0.7.1.orig/requirements-py2.txt 2015-02-17 13:30:27.000000000 -0500
++++ taskflow-0.7.1/requirements-py2.txt 2015-04-10 12:00:23.039961966 -0400
+@@ -7,9 +7,6 @@ pbr>=0.6,!=0.7,<1.0
+
+ # Packages needed for using this library.
+
+-# Only needed on python 2.6
+-ordereddict
+-
+ # Python 2->3 compatibility library.
+ six>=1.7.0
+
diff -Nru python-taskflow-0.7.1/debian/patches/series python-taskflow-0.7.1/debian/patches/series
--- python-taskflow-0.7.1/debian/patches/series 2015-04-28 14:40:51.000000000 +0100
+++ python-taskflow-0.7.1/debian/patches/series 2015-07-09 16:52:04.000000000 +0100
@@ -1 +1 @@
-disable-kombu-3-test.patch
+fix-requirements.patch
diff -Nru python-taskflow-0.7.1/debian/tests/control python-taskflow-0.7.1/debian/tests/control
--- python-taskflow-0.7.1/debian/tests/control 1970-01-01 01:00:00.000000000 +0100
+++ python-taskflow-0.7.1/debian/tests/control 2015-07-09 16:49:18.000000000 +0100
@@ -0,0 +1,5 @@
+Tests: python-taskflow
+Depends: @, python-all, testrepository, python-mock, python-testtools, python-kazoo,
+ python-kombu, python-zake, python-oslo-serialization, python-oslo-utils, python-oslotest,
+ python-jsonschema
+Restrictions: allow-stderr
diff -Nru python-taskflow-0.7.1/debian/tests/python-taskflow python-taskflow-0.7.1/debian/tests/python-taskflow
--- python-taskflow-0.7.1/debian/tests/python-taskflow 1970-01-01 01:00:00.000000000 +0100
+++ python-taskflow-0.7.1/debian/tests/python-taskflow 2015-07-09 16:49:18.000000000 +0100
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+set -e -u
+testr init && testr run taskflow.tests.unit.test_storage
--- End Message ---
--- Begin Message ---
This has been addressed in Experimental, so this bug can be clsoed (it's
going to be uploaded next October with the rest of Liberty).
Cheers,
Thomas
--- End Message ---
