From a57a093e73a7ecd98bdd6223ee893e58a5343532 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Wed, 17 Apr 2013 15:56:05 -0400
Subject: [PATCH] Rebased to master

---
 common/lib/capa/capa/tests/test_input_templates.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/lib/capa/capa/tests/test_input_templates.py b/common/lib/capa/capa/tests/test_input_templates.py
index 1a046ddf4b..4ca020be07 100644
--- a/common/lib/capa/capa/tests/test_input_templates.py
+++ b/common/lib/capa/capa/tests/test_input_templates.py
@@ -98,7 +98,7 @@ class ChoiceGroupTemplateTest(TemplateTestCase):
                         'input_type': 'checkbox',
                         'name_array_suffix': '1',
                         'value': '3'}
-        super(TestChoiceGroupTemplate, self).setUp()
+        super(ChoiceGroupTemplateTest, self).setUp()
 
     def test_problem_marked_correct(self):
         """Test conditions under which the entire problem
@@ -298,16 +298,15 @@ class ChoiceGroupTemplateTest(TemplateTestCase):
 class TextlineTemplateTest(TemplateTestCase):
     """Test mako template for `<textline>` input"""
 
-    # Allow us to pass an extra arg to setUp to configure
-    # the test case.
-    #pylint: disable=W0221
+    TEMPLATE_NAME = 'textline.html'
+
     def setUp(self):
         self.context = {'id': '1',
                         'status': 'correct',
                         'value': '3',
                         'preprocessor': None,
                         'trailing_text': None}
-        super(TextlineTemplateTest, self).setUp('textline.html')
+        super(TextlineTemplateTest, self).setUp()
 
     def test_section_class(self):
         cases = [ ({}, ' capa_inputtype '),