Update tests and samples

seratch · seratch · commit 7cd8198d7af0 · 2020-07-31T22:30:42.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 language:
   python
-sudo:
-  false
 python:
   - "3.6"
   - "3.7"
@@ -11,4 +9,4 @@ python:
 install:
   - python setup.py install
 script:
-  - python setup.py test
+  - python -m pytest tests/
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ def event_test(ack, say):
     say("What's up?")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     app.start(3000) # POST http://localhost:3000/slack/events
 ```
 
diff --git a/samples/app.py b/samples/app.py
@@ -152,7 +152,7 @@ def bot_message_deleted(logger):
     logger.info("A bot message has been deleted")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     app.start(3000)
 
 # pip install slackclient
diff --git a/samples/async_app.py b/samples/async_app.py
@@ -26,7 +26,7 @@ async def event_test(payload, say, logger):
     await say("What's up?")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     app.start(3000)
 
 # pip install slackclient
diff --git a/samples/oauth_app.py b/samples/oauth_app.py
@@ -18,7 +18,7 @@ def event_test(payload, say, logger):
     say("What's up?")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     app.start(3000)
 
 # pip install slackclient
diff --git a/setup.py b/setup.py
@@ -31,18 +31,20 @@
         "slackclient>=2,<3",  # TODO: will be replaced with slack_sdk==3.0.0
         "aiohttp>=3,<4",  # slackclient depends on aiohttp
     ],
-    extra_requires=[
-        # used only under src/slack_bolt/adapter
-        "Django>=3,<4",
-        "falcon>=2,<3",
-        "fastapi>=0.54,<0.55",
-        "Flask>=1,<2",
-        "pyramid>=1,<2",
-        "responder>=2,<3",
-        "starlette>=0.13,<1",
-        # used only under src/slack_sdk/*_store
-        "boto3<=2",
-    ],
+    extras_require={
+        "adapters": [
+            # used only under src/slack_bolt/adapter
+            "Django>=3,<4",
+            "falcon>=2,<3",
+            "fastapi>=0.54,<0.55",
+            "Flask>=1,<2",
+            "pyramid>=1,<2",
+            "responder>=2,<3",
+            "starlette>=0.13,<1",
+            # used only under src/slack_sdk/*_store
+            "boto3<=2",
+        ]
+    },
     classifiers=[
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
diff --git a/tests/scenario_tests/test_async_events.py b/tests/scenario_tests/test_async_events.py
@@ -84,6 +84,19 @@ async def test_process_before_response(self):
         # no sleep here
         assert self.mock_received_requests["/chat.postMessage"] == 1
 
+    @pytest.mark.asyncio
+    async def test_middleware_skip(self):
+        app = AsyncApp(
+            client=self.web_client,
+            signing_secret=self.signing_secret
+        )
+        app.event("app_mention", middleware=[skip_middleware])(whats_up)
+
+        request = self.build_valid_app_mention_request()
+        response = await app.async_dispatch(request)
+        assert response.status == 404
+        assert self.mock_received_requests["/auth.test"] == 1
+
     @pytest.mark.asyncio
     async def test_simultaneous_requests(self):
         app = AsyncApp(
@@ -95,27 +108,17 @@ async def test_simultaneous_requests(self):
         request = self.build_valid_app_mention_request()
 
         times = 10
+        tasks = []
         for i in range(times):
-            asyncio.ensure_future(app.async_dispatch(request))
+            tasks.append(asyncio.ensure_future(app.async_dispatch(request)))
 
         await asyncio.sleep(5)
+        # Verifies all the tasks have been completed with 200 OK
+        assert sum([t.result().status for t in tasks if t.done()]) == 200 * times
 
         assert self.mock_received_requests["/auth.test"] == times
         assert self.mock_received_requests["/chat.postMessage"] == times
 
-    @pytest.mark.asyncio
-    async def test_middleware_skip(self):
-        app = AsyncApp(
-            client=self.web_client,
-            signing_secret=self.signing_secret
-        )
-        app.event("app_mention", middleware=[skip_middleware])(whats_up)
-
-        request = self.build_valid_app_mention_request()
-        response = await app.async_dispatch(request)
-        assert response.status == 404
-        assert self.mock_received_requests["/auth.test"] == 1
-
 
 app_mention_payload = {
     "token": "verification_token",
@@ -141,7 +144,7 @@ async def test_middleware_skip(self):
 
 async def random_sleeper(payload, say):
     assert payload == app_mention_payload
-    seconds = random() + 2 # 2-3 seconds
+    seconds = random() + 2  # 2-3 seconds
     await asyncio.sleep(seconds)
     await say(f"Sending this message after sleeping for {seconds} seconds")
 
