Permalink
Browse files

Removed our patch for collective.testcaselayer.

Pin collective.testcaselayer 1.5.
1.4 would work too, but not the 1.3 that is pinned by default in Plone 4.0 and 4.1.
  • Loading branch information...
1 parent 3c1dc36 commit a14e746df741dbf88fe5b27851915bd21b03758a @mauritsvanrees mauritsvanrees committed Oct 4, 2012
Showing with 2 additions and 20 deletions.
  1. +0 −20 Products/remember/tests/base.py
  2. +2 −0 buildout.cfg
@@ -17,33 +17,13 @@
ZopeTestCase.installProduct("membrane")
ZopeTestCase.installProduct("remember")
-# klm 2011-03-18 workaround collective.testcaselayer bug:
-# the current version uses SecureMailHost, which is obsolete and causes test
-# failures. this measure should still work fine when collective.testcaselayer
-# is fixed, but would best be retired then.
-from Products.MailHost import MailHost
-#mail.MockMailHost.__bases__ = (MailHost.MailHost,)
-mail.dubiousMockMailHost = mail.MockMailHost
-
def load_zcml_of_testing_profile():
fiveconfigure.debug_mode = True
zcml.load_config('testing.zcml', package=Products.remember)
fiveconfigure.debug_mode = False
-class fixedMockMailHost(MailHost.MailHost, mail.MockMailHost):
- """"Derive class to use MailHost instead of SecureMailHost methods."""
- def __init__(self, id):
- MailHost.MailHost.__init__(self, id)
- self.reset()
- # must force some methods from MockMailHost to be used
- _send = mail.MockMailHost._send
- __len__ = mail.MockMailHost.__len__
- reset = mail.MockMailHost.reset
-
-mail.MockMailHost = fixedMockMailHost
-
mem_password = 'secret'
def_mem_data = {
'email': 'noreply@xxxxxxxxyyyyyy.com',
View
@@ -7,6 +7,7 @@ extends =
package-name = Products.remember
test-eggs = Products.remember[test]
+
[sources]
Products.membrane = git git@github.com:collective/Products.membrane.git
@@ -20,3 +21,4 @@ eggs += plone.reload
[versions]
Products.membrane = 2.1.5
plone.reload = 2.0
+collective.testcaselayer = 1.5

0 comments on commit a14e746

Please sign in to comment.