Commit Graph

11974 Commits

Author SHA1 Message Date
Ned Batchelder
0cfcd183b2 No need to wrap comments that tightly. 2013-03-29 15:05:22 -04:00
Ned Batchelder
e8f8e9e197 Enough is enough. 2013-03-29 14:49:24 -04:00
Jay Zoldak
a5b1428bba Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests
Feature/will/speed up unit tests
2013-03-29 10:53:10 -07:00
Jay Zoldak
d044d5c48d a few more pep8 fixes 2013-03-29 13:15:33 -04:00
David Ormsbee
f6e9b2edd7 Merge pull request #1767 from MITx/hotfix/diana/input-state-fix
Remove the default and prevent input_state from persisting across problems
2013-03-29 09:29:09 -07:00
Diana Huang
17adc986bd Remove the default and prevent input_state from keeping around
unnecessary data.
2013-03-29 12:16:27 -04:00
David Ormsbee
34899c20ba Merge pull request #1764 from MITx/hotfix/diana/random_check_bug
Fixed bug in parsing of urandom struct so that seed
2013-03-29 08:10:49 -07:00
Jay Zoldak
b63aae221e small pep8 pylint and superclass fixes 2013-03-29 10:41:27 -04:00
Will Daly
f90dd49556 Fixed bug in parsing of urandom struct so that seed
is set to an integer (and correctly saved) instead of a tuple.
2013-03-29 10:18:11 -04:00
Will Daly
5bf839c9a9 Guard against trying to load a template when checking pages. 2013-03-28 16:55:20 -04:00
Will Daly
d92533bb51 Test case now drops the mongo collection 2013-03-28 16:41:55 -04:00
Will Daly
86bc70c3c2 Reverted cms changes back 2013-03-28 15:00:19 -04:00
Ned Batchelder
252f9364a6 Merge pull request #1761 from MITx/content/rocha/utaustinx-courses
Content/rocha/utaustinx courses
2013-03-28 10:26:02 -07:00
Carlos Andrés Rocha
a15baa97c5 Add UTAustinX landing page 2013-03-28 13:23:58 -04:00
Carlos Andrés Rocha
4050da6b4c Enable meta-universities (organizations that contain other) 2013-03-28 13:23:50 -04:00
Will Daly
f652fb5f73 Pylint and pep8 fixes 2013-03-28 12:51:09 -04:00
Will Daly
6f8c9b4a9f Optimized ModuleStoreTestCase to reload templates only once
over all test runs.
2013-03-28 12:31:46 -04:00
chrisndodge
210101dc21 Merge pull request #1759 from MITx/bug/christina/grading
Bug fix for grading type not showing on course outline (#258).
2013-03-28 08:11:28 -07:00
cahrens
7279f9c460 Bug fix for grading type not showing on course outline (#258). 2013-03-28 10:54:10 -04:00
Jay Zoldak
c9a7be6b9b Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers
Feature/will/lettuce test helpers
2013-03-28 07:26:14 -07:00
Will Daly
13c01ec3fc Randomized instructor page tests 2013-03-28 10:03:05 -04:00
Don Mitchell
fece937669 Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata
Fix/cdodge/use request scoped cache for metadata inheritance
2013-03-28 06:51:20 -07:00
Will Daly
bf37d4a9a3 Randomized loading of test pages for dark launch test 2013-03-28 09:33:51 -04:00
Will Daly
c48f119cec Skip test of mock_xqueue_server 2013-03-28 09:13:28 -04:00
Will Daly
3eefb7d5ec Resolved conflicts from rebase to master; fixed keyword error caught by
pylint
2013-03-28 08:58:56 -04:00
Will Daly
27a31230bf Removed full course tests 2013-03-28 08:55:45 -04:00
Will Daly
7978c581db Changed test for checking all pages to checking a random page 2013-03-28 08:55:16 -04:00
Chris Dodge
3f52261b5b hmmm. actually, we should only write out to memcache if we've recomputed. Otherwise, a memcache hit will end up writing back to memcache... 2013-03-27 23:18:38 -04:00
Chris Dodge
d448aa1365 remove debug log messages 2013-03-27 23:13:33 -04:00
Chris Dodge
446397b23b remove unused thread.local() 2013-03-27 23:12:00 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
Chris Dodge
03f9bb5d38 use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down 2013-03-27 22:37:07 -04:00
Victor Shnayder
a79a2907a9 Merge pull request #1755 from MITx/fix/brian/fix500v1
Fix/brian/fix500v1
2013-03-27 15:21:30 -07:00
Brian Wilson
c639799a07 fix missing import 2013-03-27 18:12:48 -04:00
Brian Wilson
bb7bc88847 merge out from master 2013-03-27 18:04:58 -04:00
Brian Wilson
99778b1b5b add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8. 2013-03-27 17:59:56 -04:00
Jay Zoldak
6564cc57e6 Fix typo with hyphen in cms lettuce feature files 2013-03-27 16:29:55 -04:00
Don Mitchell
6d63d13fa8 Merge pull request #1753 from MITx/bug/christina/studio
Converter cleanup.
2013-03-27 12:46:01 -07:00
David Ormsbee
6e3d9608b4 Merge pull request #1754 from MITx/fix/cale/enrollment-integrity-error
An integrity error while creating an enrollment just means that our work...
2013-03-27 12:03:26 -07:00
Calen Pennington
122c8567c5 An integrity error while creating an enrollment just means that our work has already been done. Fixes https://www.pivotaltracker.com/story/show/46915947 2013-03-27 15:00:08 -04:00
cahrens
5c78218b13 Don't need to convert to milliseconds. 2013-03-27 14:52:27 -04:00
cahrens
22537ffd3b Don't need to convert to milliseconds. 2013-03-27 14:51:39 -04:00
Victor Shnayder
b0356e32b2 Merge pull request #1589 from MITx/peter/symbolic
Added support for superscripts in variables
2013-03-27 10:40:50 -07:00
Victor Shnayder
eca18a1237 Merge pull request #1752 from MITx/fix/will/bug_294
Fix bug 294
2013-03-27 10:39:42 -07:00
Will Daly
cddc868656 Login URL resolves differently in LMS and CMS, which breaks login_test
when loaded by rake test_cms

I moved the test into lms/courseware/tests so they run correctly.
2013-03-27 13:01:10 -04:00
cahrens
227a5e8266 Delete converters, move unit tests to test_fields, add new additional test cases. 2013-03-27 12:56:06 -04:00
Will Daly
15ea32b095 Fixed bug 294, caused by unicode encoding error when creating logging
strings.

Added unit tests that verify the fix.
2013-03-27 12:53:58 -04:00
brianhw
a04881ceda Merge pull request #1740 from MITx/fix/vik/peer-image-grading
Fix/vik/peer image grading
2013-03-27 09:06:54 -07:00
Vik Paruchuri
7101c76016 comment on rewrite links change 2013-03-27 12:02:32 -04:00
Victor Shnayder
8905343f80 Merge pull request #1744 from MITx/fix/diana/image-response-show-answer
Fix 500 errors for bug #289
2013-03-27 07:14:38 -07:00