Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

67 Commits

Author SHA1 Message Date
Calen Pennington
69beea854c Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports 
Record junit reports of jasmine tests
 2013-05-23 11:06:34 -07:00
Calen Pennington
b2b6ca5f7b Record junit reports of jasmine tests 2013-05-22 22:01:44 -04:00
Calen Pennington
dcefd9e991 Taught rake test_lms and test_cms to run specific tests by passing a single argument 2013-05-22 21:37:48 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing 
Feature/zoldak/forum testing
 2013-05-17 10:10:55 -07:00
Jay Zoldak
9fba56c0e2 Include running jasmine tests for discussion forums on jenkins 2013-05-16 16:49:25 -04:00
Will Daly
d1fee427fe Updated Jenkins script to reflect new requirements installation process 2013-05-16 11:39:44 -04:00
Will Daly
342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests 
Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile
 2013-05-16 11:21:59 -04:00
Calen Pennington
ec7c47828f Merge pull request #1961 from edx/feature/cale/maintain-dev-environment 
Feature/cale/maintain dev environment
 2013-05-15 12:36:36 -07:00
Calen Pennington
352a4da5b8 Use install_prereqs in tests 2013-05-15 15:25:42 -04:00
Calen Pennington
1746c60072 Merge pull request #2027 from edx/fix/cale/allow-liveserver-port-ranges 
Allow django liveserver to use larger port range
 2013-05-15 12:19:25 -07:00
Calen Pennington
f499dec1db Merge pull request #2028 from edx/feature/cale/flexible-repo-jenkins 
Make gcli commands flexible around org and repo name
 2013-05-15 12:15:48 -07:00
Calen Pennington
8b7970938f Use one virtualenv for each parallel build process 2013-05-15 13:39:21 -04:00
Calen Pennington
b3e8d59762 Make gcli commands flexible around org and repo name 2013-05-15 13:19:42 -04:00
Calen Pennington
5cc15fccf1 Allow django liveserver to use larger port range 2013-05-15 13:19:22 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Will Daly
405299712c Disabled color output from lettuce tests in the Jenkins logs 2013-05-15 11:38:11 -04:00
Jay Zoldak
30e8e2e2ae Update repo name in jenkins test shell script. 2013-05-13 16:30:01 -04:00
Will Daly
17bd4d0236 Changed permissions on test_acceptance.sh to make it executable 2013-05-13 16:21:43 -04:00
Will Daly
baa7916aa7 Added Jenkins script to run acceptance tests 
Fixed a typo in the original jenkins/test.sh script
 2013-05-13 12:11:14 -04:00
e0d
9ee246e407 flexible org repos parsing tested locally 2013-05-02 15:50:33 -04:00
Jay Zoldak
0b452f6195 Change org for gcli status command from mitx to edx 2013-05-02 12:41:59 -04:00
Calen Pennington
436d95bfab Make tests install coffee locally 2013-04-29 07:32:16 -04:00
Calen Pennington
bbab2d7de7 Install gemfiles for tests 2013-04-18 10:09:21 -04:00
Calen Pennington
369c4a3195 Don't try and install test-requirements.txt anymore 2013-04-16 11:40:04 -04:00
Jay Zoldak
f6b6f16ba5 Update the comments explaining test execution 2013-04-01 10:58:00 -04:00
Jay Zoldak
1679f1e31d Enable executing the lms jasmine tests as part of the build 2013-04-01 10:52:11 -04:00
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