Merge branch 'master' into will/diff-cover-integration

2013-06-04 18:19:07 -04:00
parent 5662ecfde9 2cfea12dfe
commit a5fc721922
186 changed files with 42549 additions and 1421 deletions
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -115,6 +115,11 @@ xmodule can be tested independently, with this:

    rake test_common/lib/xmodule

+other module level tests include
+
+* `rake test_common/lib/capa`
+* `rake test_common/lib/calc`
+
 To run a single django test class:

    rake test_lms[courseware.tests.tests:testViewAuth]