Merge pull request #393 from MITx/feature/victor/bad-content-warn-not-error

Feature/victor/bad content warn not error

common/djangoapps/student/views.py

@@ -128,7 +128,7 @@ def dashboard(request):
         try:
             courses.append(course_from_id(enrollment.course_id))
         except ItemNotFoundError:
-            log.error("User {0} enrolled in non-existant course {1}"
+            log.error("User {0} enrolled in non-existent course {1}"
                       .format(user.username, enrollment.course_id))
 
     message = ""
@@ -182,7 +182,7 @@ def change_enrollment(request):
         try:
             course = course_from_id(course_id)
         except ItemNotFoundError:
-            log.error("User {0} tried to enroll in non-existant course {1}"
+            log.warning("User {0} tried to enroll in non-existant course {1}"
                       .format(user.username, enrollment.course_id))
             return {'success': False, 'error': 'The course requested does not exist.'}
 

common/lib/capa/capa/capa_problem.py

@@ -295,9 +295,9 @@ class LoncapaProblem(object):
                 try:
                     ifp = self.system.filestore.open(file)  # open using ModuleSystem OSFS filestore
                 except Exception as err:
-                    log.error('Error %s in problem xml include: %s' % (
+                    log.warning('Error %s in problem xml include: %s' % (
                             err, etree.tostring(inc, pretty_print=True)))
-                    log.error('Cannot find file %s in %s' % (
+                    log.warning('Cannot find file %s in %s' % (
                             file, self.system.filestore))
                     # if debugging, don't fail - just log error
                     # TODO (vshnayder): need real error handling, display to users
@@ -308,9 +308,9 @@ class LoncapaProblem(object):
                 try:
                     incxml = etree.XML(ifp.read())    # read in and convert to XML
                 except Exception as err:
-                    log.error('Error %s in problem xml include: %s' % (
+                    log.warning('Error %s in problem xml include: %s' % (
                             err, etree.tostring(inc, pretty_print=True)))
-                    log.error('Cannot parse XML in %s' % (file))
+                    log.warning('Cannot parse XML in %s' % (file))
                     # if debugging, don't fail - just log error
                     # TODO (vshnayder): same as above
                     if not self.system.get('DEBUG'):

common/lib/xmodule/xmodule/capa_module.py

@@ -150,7 +150,7 @@ class CapaModule(XModule):
             # TODO (vshnayder): do modules need error handlers too?
             # We shouldn't be switching on DEBUG.
             if self.system.DEBUG:
-                log.error(msg)
+                log.warning(msg)
                 # TODO (vshnayder): This logic should be general, not here--and may
                 # want to preserve the data instead of replacing it.
                 # e.g. in the CMS

common/lib/xmodule/xmodule/modulestore/xml.py

@@ -50,8 +50,9 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
                 # have been imported into the cms from xml
                 xml = clean_out_mako_templating(xml)
                 xml_data = etree.fromstring(xml)
-            except:
-                log.exception("Unable to parse xml: {xml}".format(xml=xml))
+            except Exception as err:
+                log.warning("Unable to parse xml: {err}, xml: {xml}".format(
+                    err=str(err), xml=xml))
                 raise
 
             # VS[compat]. Take this out once course conversion is done
@@ -194,7 +195,7 @@ class XMLModuleStore(ModuleStoreBase):
             if org is None:
                 msg = ("No 'org' attribute set for course in {dir}. "
                           "Using default 'edx'".format(dir=course_dir))
-                log.error(msg)
+                log.warning(msg)
                 tracker(msg)
                 org = 'edx'
 
@@ -206,7 +207,7 @@ class XMLModuleStore(ModuleStoreBase):
                         dir=course_dir,
                         default=course_dir
                         ))
-                log.error(msg)
+                log.warning(msg)
                 tracker(msg)
                 course = course_dir
 

common/lib/xmodule/xmodule/x_module.py

@@ -522,7 +522,7 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
             # Put import here to avoid circular import errors
             from xmodule.error_module import ErrorDescriptor
             msg = "Error loading from xml."
-            log.exception(msg)
+            log.warning(msg + " " + str(err))
             system.error_tracker(msg)
             err_msg = msg + "\n" + exc_info_to_str(sys.exc_info())
             descriptor = ErrorDescriptor.from_xml(xml_data, system, org, course,
@@ -615,9 +615,10 @@ class DescriptorSystem(object):
                try:
                   x = access_some_resource()
                   check_some_format(x)
-               except SomeProblem:
-                  msg = 'Grommet {0} is broken'.format(x)
-                  log.exception(msg) # don't rely on handler to log
+               except SomeProblem as err:
+                  msg = 'Grommet {0} is broken: {1}'.format(x, str(err))
+                  log.warning(msg)  # don't rely on tracker to log
+                        # NOTE: we generally don't want content errors logged as errors
                   self.system.error_tracker(msg)
                   # work around
                   return 'Oops, couldn't load grommet'

doc/development.md

@@ -35,6 +35,10 @@ This runs all the tests (long, uses collectstatic):
 
     rake test
 
+If if you aren't changing static files, can run `rake test` once, then run
+
+    rake fasttest_{lms,cms}
+
 xmodule can be tested independently, with this:
 
     rake test_common/lib/xmodule
@@ -43,3 +47,21 @@ To see all available rake commands, do this:
 
     rake -T
 
+To run a single django test class:
+
+    django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/courseware/tests/tests.py:TestViewAuth
+
+To run a single django test:
+
+    django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/courseware/tests/tests.py:TestViewAuth.test_dark_launch
+
+
+To run a single nose test file:
+
+    nosetests common/lib/xmodule/xmodule/tests/test_stringify.py
+
+To run a single nose test:
+
+    nosetests common/lib/xmodule/xmodule/tests/test_stringify.py:test_stringify
+
+