From 3919b4a47b161b93f8f393384eebd2d2f8f495be Mon Sep 17 00:00:00 2001
From: Muhammad Ammar <mammar@gmail.com>
Date: Fri, 23 May 2014 12:39:18 +0000
Subject: [PATCH] Unique Course Fix

---
 common/test/acceptance/tests/helpers.py             | 7 +++++--
 common/test/acceptance/tests/test_studio_general.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/test/acceptance/tests/helpers.py b/common/test/acceptance/tests/helpers.py
index 1d568504c5..764c437b35 100644
--- a/common/test/acceptance/tests/helpers.py
+++ b/common/test/acceptance/tests/helpers.py
@@ -27,6 +27,11 @@ class UniqueCourseTest(WebAppTest):
         """
         Create a unique course ID.
         """
+        super(UniqueCourseTest, self).__init__(*args, **kwargs)
+
+    def setUp(self):
+        super(UniqueCourseTest, self).setUp()
+
         self.course_info = {
             'org': 'test_org',
             'number': self.unique_id,
@@ -34,8 +39,6 @@ class UniqueCourseTest(WebAppTest):
             'display_name': 'Test Course' + self.unique_id
         }
 
-        super(UniqueCourseTest, self).__init__(*args, **kwargs)
-
     @property
     def course_id(self):
         return self.COURSE_ID_SEPARATOR.join([
diff --git a/common/test/acceptance/tests/test_studio_general.py b/common/test/acceptance/tests/test_studio_general.py
index a170ee1c61..2540c39dd3 100644
--- a/common/test/acceptance/tests/test_studio_general.py
+++ b/common/test/acceptance/tests/test_studio_general.py
@@ -75,7 +75,7 @@ class CoursePagesTest(UniqueCourseTest):
         """
         Install a course with no content using a fixture.
         """
-        super(UniqueCourseTest, self).setUp()
+        super(CoursePagesTest, self).setUp()
 
         CourseFixture(
             self.course_info['org'],