Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion sendgrid/helpers/inbound/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ def inbound_parse():
return "OK"


if __name__ == '__main__':
def main():
# Be sure to set config.debug_mode to False in production
port = int(os.environ.get("PORT", config.port))
if port != config.port:
config.debug = False
app.run(host='0.0.0.0', debug=config.debug_mode, port=port)


if __name__ == '__main__':
main()
35 changes: 35 additions & 0 deletions test/test_app.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
from unittest import mock
from unittest.mock import MagicMock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For Python 2.6, 2.7 builds to pass, we have to add a little bit of trickery:

try:
    import unittest2 as unittest
except ImportError:
    import unittest

and for mock, it looks like we can borrow some advice from this guy:

try:
    from mock import patch, mock_open
except ImportError:
    from unittest.mock import patch, mock_open

Can you please make these two changes? I am hoping the build will pass once this is done!


import os
import sendgrid.helpers.inbound.app as App
from sendgrid.helpers.inbound.app import app
from sendgrid.helpers.inbound.config import Config

try:
import unittest2 as unittest
except ImportError:
import unittest

class AppTest(unittest.TestCase):

def setUp(self):
App.app = app.test_client(self)
App.app.run = MagicMock()
App.config.debug = True

@mock.patch.dict(os.environ, {'PORT': '5001'})
def test_main_no_debug(self):
App.main()
self.assertFalse(App.config.debug)
self.assertTrue(App.app.run.called)

@mock.patch.dict(os.environ, {'PORT': '5000'})
def test_main_debug(self):
App.main()
self.assertTrue(App.config.debug)
self.assertTrue(App.app.run.called)

def test_get_home(self):
response = App.app.get('/')
self.assertEqual(response.status_code, 200)