Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/features/test/inboundemail_test.py b/features/test/inboundemail_test.py
index 6c13827..0eaa281 100644
--- a/features/test/inboundemail_test.py
+++ b/features/test/inboundemail_test.py
@@ -15,6 +15,7 @@
import mox
import time
+from google.appengine.api import mail
from google.appengine.ext.webapp.mail_handlers import BounceNotificationHandler
import settings
@@ -36,7 +37,6 @@
class InboundEmailTest(unittest.TestCase):
-
def setUp(self):
self.cnxn = 'fake cnxn'
self.services = service_manager.Services(
@@ -358,28 +358,6 @@
self.mox.UnsetStubs()
self.mox.ResetAll()
- def testPost_Normal(self):
- """Normally, our post() just calls BounceNotificationHandler post()."""
- self.mox.StubOutWithMock(BounceNotificationHandler, 'post')
- BounceNotificationHandler.post()
- self.mox.ReplayAll()
-
- self.servlet.post()
- self.mox.VerifyAll()
-
- def testPost_Exception(self):
- """Our post() method works around an escaping bug."""
- self.servlet.request = webapp2.Request.blank(
- '/', POST={'raw-message': 'this is an email message'})
-
- self.mox.StubOutWithMock(BounceNotificationHandler, 'post')
- BounceNotificationHandler.post().AndRaise(AttributeError())
- BounceNotificationHandler.post()
- self.mox.ReplayAll()
-
- self.servlet.post()
- self.mox.VerifyAll()
-
def testReceive_Normal(self):
"""Find the user that bounced and set email_bounce_timestamp."""
self.assertEqual(0, self.user.email_bounce_timestamp)