Merge branch 'master' into diana/fix-sa-tests

2013-01-18 15:49:03 -05:00
parent 89055da8ba 878640b651
commit 999a648c3f
1 changed files with 4 additions and 0 deletions
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -338,6 +338,10 @@ def course_beta_test_group_name(location):
    """
    return 'beta_testers_{0}'.format(Location(location).course)

+# nosetests thinks that anything with _test_ in the name is a test.
+# Correct this (https://nose.readthedocs.org/en/latest/finding_tests.html)
+course_beta_test_group_name.__test__ = False
+

 def _course_instructor_group_name(location):
    """