r13531 - in Products.Archetypes/branches/1.6: . Products/Archetypes Products/Archetypes/tests

Author: esteele
Date: Mon Mar 28 01:10:08 2011
New Revision: 13531

Modified:
   Products.Archetypes/branches/1.6/   (props changed)
   Products.Archetypes/branches/1.6/CHANGES.txt
   Products.Archetypes/branches/1.6/Products/Archetypes/   (props changed)
   Products.Archetypes/branches/1.6/Products/Archetypes/tests/attestcase.py
Log:
Backport [13529].

Modified: Products.Archetypes/branches/1.6/CHANGES.txt
==============================================================================
--- Products.Archetypes/branches/1.6/CHANGES.txt	(original)
+++ Products.Archetypes/branches/1.6/CHANGES.txt	Mon Mar 28 01:10:08 2011
@@ -4,6 +4,9 @@
 1.6.6 - Unreleased
 ------------------
 
+- Fixed test setup to work with ZCA-based GenericSetup profile registry.
+  [davisagli]
+
 1.6.5 - 2011-02-25
 ------------------
 

Modified: Products.Archetypes/branches/1.6/Products/Archetypes/tests/attestcase.py
==============================================================================
--- Products.Archetypes/branches/1.6/Products/Archetypes/tests/attestcase.py	(original)
+++ Products.Archetypes/branches/1.6/Products/Archetypes/tests/attestcase.py	Mon Mar 28 01:10:08 2011
@@ -5,6 +5,7 @@
 
 from Products.CMFTestCase import CMFTestCase
 from Products.CMFTestCase.ctc import setupCMFSite
+from Products.CMFTestCase.layer import onsetup
 from Products.GenericSetup import EXTENSION, profile_registry
 
 from Products.Archetypes.tests.layer import ZCML
@@ -12,12 +13,14 @@
 default_user = user_name
 default_role = 'Member'
 
-profile_registry.registerProfile('Archetypes_sampletypes',
-    'Archetypes Sample Content Types',
-    'Extension profile including Archetypes sample content types',
-    'profiles/sample_types',
-    'Products.Archetypes',
-    EXTENSION)
+@onsetup
+def setupSampleTypeProfile():
+    profile_registry.registerProfile('Archetypes_sampletypes',
+        'Archetypes Sample Content Types',
+        'Extension profile including Archetypes sample content types',
+        'profiles/sample_types',
+        'Products.Archetypes',
+        EXTENSION)
 
 # setup a CMF site
 ZopeTestCase.installProduct('PythonScripts')
@@ -28,6 +31,7 @@
 ZopeTestCase.installProduct('PortalTransforms')
 ZopeTestCase.installProduct('Archetypes')
 
+setupSampleTypeProfile()
 setupCMFSite(
     extension_profiles=['Products.CMFFormController:CMFFormController',
                         'Products.CMFQuickInstallerTool:CMFQuickInstallerTool',

------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software 
be a part of the solution? Download the Intel(R) Manageability Checker 
today! http://p.sf.net/sfu/intel-dev2devmar