Merge 7f39469 into 8f0a5ea

aiohttp/test_utils.py

@@ -472,14 +472,28 @@ def get_app(self, loop):
         """
         pass
 
-    def setUp(self):
-        self.loop = setup_test_loop()
-        self.app = self.get_app(self.loop)
-        self.client = TestClient(self.app)
-
-    def tearDown(self):
-        del self.client
-        teardown_test_loop(self.loop)
+    @classmethod
+    def setUpClass(cls):
+        super(AioHTTPTestCase, cls).setUpClass()
+
+        def setup_decorator(method):
+            def decorated(self, *args, **kwargs):
+                self.loop = setup_test_loop()
+                self.app = self.get_app(self.loop)
+                self.client = TestClient(self.app)
+                return method(self, *args, **kwargs)
+            return decorated
+
+        def teardown_decorator(method):
+            def decorated(self, *args, **kwargs):
+                result = method(self, *args, **kwargs)
+                del self.client
+                teardown_test_loop(self.loop)
+                return result
+            return decorated
+
+        cls.setUp = setup_decorator(cls.setUp)
+        cls.tearDown = teardown_decorator(cls.tearDown)
 
 
 def unittest_run_loop(func):

tests/test_test_utils.py

@@ -80,6 +80,35 @@ def test_test_client_close_is_idempotent():
     client.close()
 
 
+def test_setup_and_teardown_for_aiohttp_test_case():
+    class TestSetupAndTearDown(AioHTTPTestCase):
+        setup_run = False
+        teardown_run = False
+
+        def get_app(self, loop):
+            return _create_example_app(loop)
+
+        def setUp(self):
+            self.setup_run = True
+
+        def tearDown(self):
+            self.teardown_run = True
+    TestSetupAndTearDown.setUpClass()
+    testcase = TestSetupAndTearDown()
+    assert not testcase.setup_run
+    assert not testcase.teardown_run
+    assert not hasattr(testcase, 'client')
+    testcase.setUp()
+    print(dir(testcase))
+    assert hasattr(testcase, 'client')
+    assert testcase.setup_run
+    assert not testcase.teardown_run
+    testcase.tearDown()
+    assert not hasattr(testcase, 'client')
+    assert testcase.setup_run
+    assert testcase.teardown_run
+
+
 class TestAioHTTPTestCase(AioHTTPTestCase):
 
     def get_app(self, loop):