Commit Graph

12296 Commits

Author SHA1 Message Date
Brian Wilson
2d1ebb7329 Test when querying for a non-existent task 2013-06-18 13:51:05 -04:00
lapentab
b9ca9a84d7 Merge branch 'master' into blapenta/fix-test-coverage
Conflicts:
	AUTHORS
	common/lib/xmodule/xmodule/tests/test_annotatable_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_html_module.py
	common/lib/xmodule/xmodule/tests/test_progress.py
	common/lib/xmodule/xmodule/tests/test_xml_module.py
	lms/djangoapps/courseware/tests/__init__.py
2013-06-18 13:41:53 -04:00
Jean Manuel Nater
78128e7672 Merge branch 'master' into jnater/playground
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	lms/djangoapps/courseware/tests/tests.py
2013-06-18 13:36:24 -04:00
lapentab
b93f00e02f Rename system_test to get_test_system 2013-06-18 11:37:24 -04:00
Brian Wilson
77032067ac Refactor test_views from test_api. Pull out pending_tasks.js. 2013-06-18 11:19:25 -04:00
Brian Wilson
c2aadbfb18 Fix issue with unicode in errors. 2013-06-18 11:17:17 -04:00
Brian Wilson
a8c3e91051 Handle failure task_output that won't fit in the model column. 2013-06-18 11:17:17 -04:00
Brian Wilson
eb1fe899e8 Fix progress reporting. 2013-06-18 11:17:17 -04:00
Brian Wilson
2c5e038f82 initial test_tasks 2013-06-18 11:17:17 -04:00
Brian Wilson
3bd2b08258 factor out InstructorTaskTestCase base class, for reuse in test_tasks. 2013-06-18 11:17:16 -04:00
Brian Wilson
a0dcc97e08 tasks now extract task_input and course_id from InstructorTask, instead of passing explicitly. 2013-06-18 11:17:16 -04:00
Brian Wilson
a67674fe34 set task_id on LMS side. 2013-06-18 11:17:16 -04:00
Brian Wilson
b224f4e8cc move test_tasks to test_integration. 2013-06-18 11:17:16 -04:00
Brian Wilson
c48dabc383 Move code to instructor_task Django app. 2013-06-18 11:17:15 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
9e11a5659f Rename task_queue.py to task_submit.py. 2013-06-18 11:13:19 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
76773c5bdf Change updating of CourseTaskLog to mostly occur in worker thread. 2013-06-18 11:13:18 -04:00
Brian Wilson
3b657d6d36 Disable randomized-problem test until bug-fix is merged in. 2013-06-18 11:13:18 -04:00
Brian Wilson
9c1881e5d6 Add unit test to regrade problem using randomization. 2013-06-18 11:13:18 -04:00
Brian Wilson
d37ebea6c0 Add tracking calls to reset (and delete). Add tests for delete. Remove sleep statement used for manual testing. 2013-06-18 11:13:18 -04:00
Brian Wilson
003c9ba5d9 Define MITX_FEATURES['ENABLE_COURSE_BACKGROUND_TASKS'] to allow background tasks to be removed from instructor dash. 2013-06-18 11:13:17 -04:00
Brian Wilson
616d18e1e3 Post-rebasing fixes to re-enable masquerading. 2013-06-18 11:13:17 -04:00
Brian Wilson
1984cfecc1 Add duration to task status. Add tests for reset-attempts. 2013-06-18 11:13:17 -04:00
Brian Wilson
297206f260 Add background task history to instructor dash (as table).
Add task-history-per-student button, and fix display of task messages.
2013-06-18 11:13:01 -04:00
Brian Wilson
6cd23875ea Remove delete button from instructor dash. (Also remove last-modified
column from task-in-progress table).
2013-06-18 11:11:34 -04:00
Brian Wilson
8872fbccd2 Add factory for CourseTaskLog.
Add unit tests for regrading at courseware level (task and task_queue).
2013-06-18 11:09:32 -04:00
Brian Wilson
8660c9a7af Check descriptor to identify problems that don't support regrading. 2013-06-18 11:09:32 -04:00
Brian Wilson
0d38789a1d Add additional background tasks: reset attempts, delete state. Update
CourseTaskLog fully after task submission, so it works in Eager mode
(for testing).
2013-06-18 11:05:33 -04:00
Brian Wilson
95c1c4b8a8 Refactor tracking and xqueue initialization to no longer require a request. Get tracking logs to work. Add transaction annotations.
Make sure to read only once from result objects when getting result status,
so that values are consistent.
2013-06-18 11:04:05 -04:00
Brian Wilson
7711c00e2c Pull task_queue.py methods out from tasks.py, to represent API calls
from client.  Tasks.py remains the task implementations running on the
celery worker.

In particular, move status message generation out of task thread to client side.
2013-06-18 11:04:05 -04:00
Brian Wilson
d503e3313f Add task progress table to instructor dash.
Add call to MakoMiddleware() to initialize templates in celery worker server.

Pass task_ids by POST properties (as a list) to collect task progress status.
2013-06-18 11:04:05 -04:00
Brian Wilson
91ac6e68e8 Define initial celery task on instructor dash.
Add CourseTaskLog, and make calls to regrading.

Add regrading implementation, and hack the marshalling of request.
2013-06-18 11:04:05 -04:00
Jonah Stanley
94238238e7 Merge pull request #58 from edx/jonahstanley/add-navigation-tests
Jonahstanley/add navigation tests
2013-06-18 07:29:17 -07:00
Vasyl Nakvasiuk
80f38b8f3c python tests for videoalpha 2013-06-18 16:30:14 +03:00
Jason Bau
33027e7e59 Merge pull request #175 from edx/fix/jbau/handle-None-discussion-start_time
Fix for broken forums due to forum entry with no start_date
2013-06-17 16:55:56 -07:00
Jason Bau
28ae2b6346 change form of making datetime.max aware (in UTC) 2013-06-17 16:11:35 -07:00
Calen Pennington
82606a062c Make XModuleDescriptor use __init__ from XBlock
Fixes JIRA LMS-203
2013-06-17 13:38:57 -04:00
Calen Pennington
438ac3b1a4 Move video xmodule tests to xmodule directory 2013-06-17 13:38:29 -04:00
Jean Manuel Nater
07486a4dbc Refactoring the code in tests.py to remove unnecessary dependencies on the XML Modulestore. 2013-06-17 11:54:16 -04:00
Jason Bau
da2fda1045 Fix for broken forums due to forum entry with no start_date
modification of @jrbl's version to handle a dict with value None
2013-06-15 01:30:42 -07:00
Alexander Kryklia
9f4dcbcd1b disables pylint warning for lettuce tests syntax 2013-06-14 11:12:32 +03:00
Valera Rozuvan
4c544d6f49 Added lettuce tests for autoplay in videoalpha. 2013-06-14 11:12:32 +03:00
JonahStanley
daf5ef146e Fixed weird issue of needed to sometimes first find then click instead of css_click 2013-06-13 16:33:39 -04:00
Vik Paruchuri
cd49e1bb68 Check to see if a location is valid before displaying it for instructor grading 2013-06-13 16:00:28 -04:00
Calen Pennington
e791e84ea7 Remove the stores_state field from XModule
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
2013-06-13 14:38:59 -04:00
Bethany LaPenta
85f1386918 Fixed test_system looking like a test to nosetests, also fixed a class in test_error_module.py that had one class inheriting from another 2013-06-13 14:30:07 -04:00
Don Mitchell
6af4402abd Squash 3 more naive datetime warnings. I think the only ones left are in
migrations.
2013-06-13 10:56:48 -04:00
Miles Steele
7fb9bfd685 fix test string comparison 2013-06-13 10:25:36 -04:00
Calen Pennington
5b8163dc9c Merge pull request #92 from edx/fix/cale/url-tests
Fix tests that vary urls.py
2013-06-12 10:47:13 -07:00