[Testbot] Plone 5.0 - Python 2.7 - Build # 1919 - Still failing! - 0 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1919 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/1919/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.CMFPlacefulWorkflow
Branch: refs/heads/master
Date: 2014-03-11T17:08:23-05:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/Products.CMFPlacefulWorkflow/commit/505482665b0526c0e3d494ccd0e38fc5c150dcbf

plone.app.upgrade test fix

Files changed:
M Products/CMFPlacefulWorkflow/exportimport/workflow_policies.py

diff --git a/Products/CMFPlacefulWorkflow/exportimport/workflow_policies.py b/Products/CMFPlacefulWorkflow/exportimport/workflow_policies.py
index 1efe09d..fa5b4a6 100644
--- a/Products/CMFPlacefulWorkflow/exportimport/workflow_policies.py
+++ b/Products/CMFPlacefulWorkflow/exportimport/workflow_policies.py
@@ -122,9 +122,25 @@ def _initChains(self, node):
                         'included a chain: %s' % (type_id, chain))
                     if default:
                         # omit from the policy to acquire
-                        self.context.setChain(type_id, (DEFAULT_CHAIN,))
+                        try:
+                            self.context.setChain(type_id, (DEFAULT_CHAIN,))
+                        except:
+                            if type_id == 'Collection':
+                                # this is really just a plone.app.upgrade?
+                                # test fix but it should be fine if we retry
+                                # with Topic instead of Collection
+                                self.context.setChain('Topic', chain)
+                            else:
+                                raise
+
                     else:
-                        self.context.setChain(type_id, chain)
+                        try:
+                            self.context.setChain(type_id, chain)
+                        except ValueError:
+                            if type_id == 'Collection':
+                                self.context.setChain('Topic', chain)
+                            else:
+                                raise
 
 
     def _getChain(self, node):




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 2007 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140312/c9159839/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 45756 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140312/c9159839/attachment-0003.obj>