[CMF-checkins] CVS: CMF/CMFDefault/tests - test_Portal.py:1.3 test_join.py:1.8

[Tres Seaver]

Update of /cvs-repository/CMF/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv30365/CMFDefault/tests

Modified Files:
	test_Portal.py test_join.py 
Log Message:
 - Merge test fixes.

=== CMF/CMFDefault/tests/test_Portal.py 1.2 => 1.3 ===
 
         site = self._makeSite()
         catalog = site.portal_catalog
+        site.portal_membership.memberareaCreationFlag = 0
 
         portal_types = [ x for x in site.portal_types.listContentTypes()
                            if x not in ( 'Discussion Item'
                                        , 'Folder'
                                        , 'Topic'
                                        ) ]
+
+        self.assertEqual( len( catalog ), 0 )
 
         for portal_type in portal_types:
 


=== CMF/CMFDefault/tests/test_join.py 1.7 => 1.8 ===
     def test_join( self ):
         self.root.manage_addProduct[ 'CMFDefault' ].manage_addCMFSite( 'site' )
         site = self.root.site
+        site.portal_membership.memberareaCreationFlag = 0
         member_id = 'test_user'
         site.portal_registration.addMember( member_id
                                           , 'zzyyzz'