Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,002 Commits 1 Branch 0 Tags
b3f00a672504e70e66a38d9d35f85df48ff70afd
Commit Graph

41 Commits

Author SHA1 Message Date
Calen Pennington
c0b6c01fd1 Use the right pip for bash OR 2013-03-12 13:30:24 -04:00
Calen Pennington
137662081f Squelch pep8 and pylint output unless they fail 2013-03-12 13:26:17 -04:00
Calen Pennington
433e50e04f Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 12:41:22 -04:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
 2013-03-12 07:23:28 -04:00
Calen Pennington
81527d60d8 Move pep8 and pylint into test suite, so that we can rachet down the number of violations 2013-03-11 12:27:56 -04:00
Calen Pennington
881e137fb0 Save lcp state when a problem is saved 2013-03-11 12:23:24 -04:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Jay Zoldak
29c4e6c066 Do not run the lms jasmine tests on jenkins for now, until we fix them. 2013-01-23 16:03:25 -05:00
Chris Dodge
575ff02f8a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 
Conflicts:
	jenkins/test.sh
 2013-01-18 10:26:44 -05:00
Ashley Penney
aeee13ab91 Fix the virtualenv creation for Jenkins. 2013-01-18 10:01:21 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Ashley Penney
0193cc5976 Remove this altogether. 2013-01-16 15:08:55 -05:00
Ashley Penney
9dd9727bb8 Another minor tweak to limit these tests to the cms. 2013-01-16 14:52:54 -05:00
Ashley Penney
e38b44157a Lets explicitly make the virtualenvs for now. 2013-01-16 14:09:48 -05:00
Ashley Penney
093839e13d flesh out comment. 2013-01-15 11:39:59 -05:00
Ashley Penney
c50c705eb6 Temporary workaround to our bizarre numpy issue. I think it's to do 
with the way shiningpanda works but I can't see any reason why.
 2013-01-15 11:17:45 -05:00
Calen Pennington
fc2d5c43f1 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/envs/aws.py
 2013-01-14 12:51:19 -05:00
Calen Pennington
19f79fa364 Prune deleted remote branches 2013-01-14 12:40:44 -05:00
cahrens
b108435a32 Make xmodule Jasmine tests fail build. 2013-01-07 10:51:32 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00
Jay Zoldak
e21c17ffeb Fail the Jenkins build when CMS Jasmine tests fail. 2012-12-19 11:32:55 -05:00
Christina Roberts
c4e86140c1 Try running xmodule Jasmine tests on Jenkins (again!). 2012-12-13 09:26:46 -05:00
Chris Dodge
e0469c35ce trying backing out the addition of the xmodule jasmine tests and see if builds start passing again on Jenkins 2012-12-12 21:13:51 -05:00
Christina Roberts
94ee5b887a Try running xmodule Jasmine tests on Jenkins. 2012-12-12 14:24:05 -05:00
Calen Pennington
3b75bbdc6f Actually run cms tests on cms master 2012-12-07 11:18:38 -05:00
Calen Pennington
38671fc83c Move files from base.sh to test.sh 2012-12-07 11:01:58 -05:00
Calen Pennington
e2ed7d1c4e Move to a single test.sh file that only runs the relevant tests for a particular branch in the repo. In particular, don't run cms tests on branches derived from master 2012-12-07 10:56:24 -05:00
Calen Pennington
5a3cdc11cd Only mark github commit status when full test suite passes 2012-12-07 10:41:24 -05:00
Calen Pennington
d4ec5946d4 Mark failed state correctly 2012-12-07 10:37:44 -05:00
Calen Pennington
3f5187401d Change message with state 2012-12-07 10:29:13 -05:00
Calen Pennington
86579efc5b Source jenkins/base.sh with the correct path 2012-12-07 09:59:21 -05:00
Calen Pennington
724cba193a Source the base jenkins configuration before running tests 2012-12-07 09:43:52 -05:00
Calen Pennington
d4cdd5b485 Make jenkins talk to the github status api 2012-12-07 09:38:47 -05:00
Jay Zoldak
7da7bf7481 Add pip install of test requirements, remove askbot requirements. 2012-11-26 14:16:01 -05:00
Calen Pennington
0cf46f7636 Namespace the coverage html and xml report generation tasks 2012-11-08 11:20:23 -05:00
Calen Pennington
17570c4c06 Create xml and html coverage reports 2012-11-08 11:20:23 -05:00
Calen Pennington
c3f0d31cc9 Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests 2012-11-08 11:20:16 -05:00
Calen Pennington
79a08266ad Make pip install during jenkins builds quieter 2012-11-08 11:19:33 -05:00
Calen Pennington
2a457bdc0f Set -e and -x on jenkins build scripts 2012-11-08 11:19:33 -05:00
Calen Pennington
6b28b70e51 Add jenkins files for builds 2012-11-08 11:19:33 -05:00