Separate test server module

miyakogi · miyakogi · commit 7e0f10474b91 · 2017-09-02T02:28:31.000+09:00
diff --git a/.noserc b/.noserc
@@ -1,5 +1,5 @@
 [nosetests]
 logging-level=INFO
-no-path-adjustment=true
+# no-path-adjustment=true
 # with-coverage=true
 # cover-package=pyppeteer
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/server.py b/tests/server.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from tornado import web
+
+
+BASE_HTML = '''
+<html>
+<head><title>main</title></head>
+<body>
+<h1 id="hello">Hello</h1>
+<a id="link1" href="./1">link1</a>
+<a id="link2" href="./2">link2</a>
+</body>
+</html>
+'''
+
+
+class MainHandler(web.RequestHandler):
+    def get(self) -> None:
+        self.write(BASE_HTML)
+
+
+class LinkHandler1(web.RequestHandler):
+    def get(self) -> None:
+        self.write('''
+<head><title>link1</title></head>
+<h1 id="link1">Link1</h1>
+<a id="back1" href="./">back1</a>
+        ''')
+
+
+class RedirectHandler1(web.RequestHandler):
+    def get(self) -> None:
+        self.redirect('/redirect2')
+
+
+class RedirectHandler2(web.RequestHandler):
+    def get(self) -> None:
+        self.write('<h1 id="red2">redirect2</h1>')
+
+
+def get_application() -> web.Application:
+    return web.Application([
+        ('/', MainHandler),
+        ('/1', LinkHandler1),
+        ('/redirect1', RedirectHandler1),
+        ('/redirect2', RedirectHandler2),
+    ], logging='error')
diff --git a/tests/test_pyppeteer.py b/tests/test_pyppeteer.py
@@ -8,55 +8,24 @@
 Tests for `pyppeteer` module.
 """
 
-import logging
 import unittest
 
 from syncer import sync
-from tornado import web
 
 from pyppeteer.launcher import launch
 from pyppeteer.util import install_asyncio, get_free_port
+from server import get_application, BASE_HTML
 
 
 def setUpModule():
-    logging.getLogger('tornado').setLevel(logging.ERROR)
     install_asyncio()
 
 
-BASE_HTML = '''
-<html>
-<head><title>main</title></head>
-<body>
-<h1 id="hello">Hello</h1>
-<a id="link1" href="./1">link1</a>
-<a id="link2" href="./2">link2</a>
-</body>
-</html>
-'''
-
-
-class MainHandler(web.RequestHandler):
-    def get(self):
-        self.write(BASE_HTML)
-
-
-class LinkHandler1(web.RequestHandler):
-    def get(self):
-        self.write('''
-<head><title>link1</title></head>
-<h1 id="link1">Link1</h1>
-<a id="back1" href="./">back1</a>
-        ''')
-
-
 class TestPyppeteer(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.port = get_free_port()
-        cls.app = web.Application([
-            ('/', MainHandler),
-            ('/1', LinkHandler1),
-        ], logging='error')
+        cls.app = get_application()
         cls.server = cls.app.listen(cls.port)
         cls.browser = launch()
         cls.page = sync(cls.browser.newPage())
@@ -67,7 +36,8 @@ def tearDownModule(cls):
         cls.server.stop()
 
     def setUp(self):
-        sync(self.page.goto('http://localhost:' + str(self.port)))
+        self.url = 'http://localhost:' + str(self.port)
+        sync(self.page.goto(self.url))
 
     @sync
     async def test_get(self):
