merge

tests/test_ses/test_ses.py

@@ -1,116 +1,116 @@
-from __future__ import unicode_literals
-import email
-
-import boto
-from boto.exception import BotoServerError
-
-import sure  # noqa
-
-from moto import mock_ses_deprecated
-
-
-@mock_ses_deprecated
-def test_verify_email_identity():
-    conn = boto.connect_ses('the_key', 'the_secret')
-    conn.verify_email_identity("test@example.com")
-
-    identities = conn.list_identities()
-    address = identities['ListIdentitiesResponse'][
-        'ListIdentitiesResult']['Identities'][0]
-    address.should.equal('test@example.com')
-
-
-@mock_ses_deprecated
-def test_domain_verify():
-    conn = boto.connect_ses('the_key', 'the_secret')
-
-    conn.verify_domain_dkim("domain1.com")
-    conn.verify_domain_identity("domain2.com")
-
-    identities = conn.list_identities()
-    domains = list(identities['ListIdentitiesResponse'][
-                   'ListIdentitiesResult']['Identities'])
-    domains.should.equal(['domain1.com', 'domain2.com'])
-
-
-@mock_ses_deprecated
-def test_delete_identity():
-    conn = boto.connect_ses('the_key', 'the_secret')
-    conn.verify_email_identity("test@example.com")
-
-    conn.list_identities()['ListIdentitiesResponse']['ListIdentitiesResult'][
-        'Identities'].should.have.length_of(1)
-    conn.delete_identity("test@example.com")
-    conn.list_identities()['ListIdentitiesResponse']['ListIdentitiesResult'][
-        'Identities'].should.have.length_of(0)
-
-
-@mock_ses_deprecated
-def test_send_email():
-    conn = boto.connect_ses('the_key', 'the_secret')
-
-    conn.send_email.when.called_with(
-        "test@example.com", "test subject",
-        "test body", "test_to@example.com").should.throw(BotoServerError)
-
-    conn.verify_email_identity("test@example.com")
-    conn.send_email("test@example.com", "test subject",
-                    "test body", "test_to@example.com")
-
-    send_quota = conn.get_send_quota()
-    sent_count = int(send_quota['GetSendQuotaResponse'][
-                     'GetSendQuotaResult']['SentLast24Hours'])
-    sent_count.should.equal(1)
-
-
-@mock_ses_deprecated
-def test_send_html_email():
-    conn = boto.connect_ses('the_key', 'the_secret')
-
-    conn.send_email.when.called_with(
-        "test@example.com", "test subject",
-        "<span>test body</span>", "test_to@example.com", format="html").should.throw(BotoServerError)
-
-    conn.verify_email_identity("test@example.com")
-    conn.send_email("test@example.com", "test subject",
-                    "<span>test body</span>", "test_to@example.com", format="html")
-
-    send_quota = conn.get_send_quota()
-    sent_count = int(send_quota['GetSendQuotaResponse'][
-                     'GetSendQuotaResult']['SentLast24Hours'])
-    sent_count.should.equal(1)
-
-
-@mock_ses_deprecated
-def test_send_raw_email():
-    conn = boto.connect_ses('the_key', 'the_secret')
-
-    message = email.mime.multipart.MIMEMultipart()
-    message['Subject'] = 'Test'
-    message['From'] = 'test@example.com'
-    message['To'] = 'to@example.com'
-
-    # Message body
-    part = email.mime.text.MIMEText('test file attached')
-    message.attach(part)
-
-    # Attachment
-    part = email.mime.text.MIMEText('contents of test file here')
-    part.add_header('Content-Disposition', 'attachment; filename=test.txt')
-    message.attach(part)
-
-    conn.send_raw_email.when.called_with(
-        source=message['From'],
-        raw_message=message.as_string(),
-    ).should.throw(BotoServerError)
-
-    conn.verify_email_identity("test@example.com")
-    conn.send_raw_email(
-        source=message['From'],
-        raw_message=message.as_string(),
-    )
-
-    send_quota = conn.get_send_quota()
-    sent_count = int(send_quota['GetSendQuotaResponse'][
-                     'GetSendQuotaResult']['SentLast24Hours'])
-    sent_count.should.equal(1)
+from __future__ import unicode_literals
+import email
+
+import boto
+from boto.exception import BotoServerError
+
+import sure  # noqa
+
+from moto import mock_ses_deprecated
+
+
+@mock_ses_deprecated
+def test_verify_email_identity():
+    conn = boto.connect_ses('the_key', 'the_secret')
+    conn.verify_email_identity("test@example.com")
+
+    identities = conn.list_identities()
+    address = identities['ListIdentitiesResponse'][
+        'ListIdentitiesResult']['Identities'][0]
+    address.should.equal('test@example.com')
+
+
+@mock_ses_deprecated
+def test_domain_verify():
+    conn = boto.connect_ses('the_key', 'the_secret')
+
+    conn.verify_domain_dkim("domain1.com")
+    conn.verify_domain_identity("domain2.com")
+
+    identities = conn.list_identities()
+    domains = list(identities['ListIdentitiesResponse'][
+                   'ListIdentitiesResult']['Identities'])
+    domains.should.equal(['domain1.com', 'domain2.com'])
+
+
+@mock_ses_deprecated
+def test_delete_identity():
+    conn = boto.connect_ses('the_key', 'the_secret')
+    conn.verify_email_identity("test@example.com")
+
+    conn.list_identities()['ListIdentitiesResponse']['ListIdentitiesResult'][
+        'Identities'].should.have.length_of(1)
+    conn.delete_identity("test@example.com")
+    conn.list_identities()['ListIdentitiesResponse']['ListIdentitiesResult'][
+        'Identities'].should.have.length_of(0)
+
+
+@mock_ses_deprecated
+def test_send_email():
+    conn = boto.connect_ses('the_key', 'the_secret')
+
+    conn.send_email.when.called_with(
+        "test@example.com", "test subject",
+        "test body", "test_to@example.com").should.throw(BotoServerError)
+
+    conn.verify_email_identity("test@example.com")
+    conn.send_email("test@example.com", "test subject",
+                    "test body", "test_to@example.com")
+
+    send_quota = conn.get_send_quota()
+    sent_count = int(send_quota['GetSendQuotaResponse'][
+                     'GetSendQuotaResult']['SentLast24Hours'])
+    sent_count.should.equal(1)
+
+
+@mock_ses_deprecated
+def test_send_html_email():
+    conn = boto.connect_ses('the_key', 'the_secret')
+
+    conn.send_email.when.called_with(
+        "test@example.com", "test subject",
+        "<span>test body</span>", "test_to@example.com", format="html").should.throw(BotoServerError)
+
+    conn.verify_email_identity("test@example.com")
+    conn.send_email("test@example.com", "test subject",
+                    "<span>test body</span>", "test_to@example.com", format="html")
+
+    send_quota = conn.get_send_quota()
+    sent_count = int(send_quota['GetSendQuotaResponse'][
+                     'GetSendQuotaResult']['SentLast24Hours'])
+    sent_count.should.equal(1)
+
+
+@mock_ses_deprecated
+def test_send_raw_email():
+    conn = boto.connect_ses('the_key', 'the_secret')
+
+    message = email.mime.multipart.MIMEMultipart()
+    message['Subject'] = 'Test'
+    message['From'] = 'test@example.com'
+    message['To'] = 'to@example.com'
+
+    # Message body
+    part = email.mime.text.MIMEText('test file attached')
+    message.attach(part)
+
+    # Attachment
+    part = email.mime.text.MIMEText('contents of test file here')
+    part.add_header('Content-Disposition', 'attachment; filename=test.txt')
+    message.attach(part)
+
+    conn.send_raw_email.when.called_with(
+        source=message['From'],
+        raw_message=message.as_string(),
+    ).should.throw(BotoServerError)
+
+    conn.verify_email_identity("test@example.com")
+    conn.send_raw_email(
+        source=message['From'],
+        raw_message=message.as_string(),
+    )
+
+    send_quota = conn.get_send_quota()
+    sent_count = int(send_quota['GetSendQuotaResponse'][
+                     'GetSendQuotaResult']['SentLast24Hours'])
+    sent_count.should.equal(1)