Merge pull request #2234 from edx/benp/fix-packer-sitespeed-aug2015

Benp/fix packer sitespeed aug2015

playbooks/roles/jenkins_worker/tasks/test_platform_worker.yml

@@ -23,7 +23,7 @@
   register: firefox_version
 - assert:
     that:
-      - "'28.0' in firefox_version"
+      - "'28.0' in firefox_version.stdout"
 
 # The role is run with a github oauth token passed in
 # as github_oauth_token var value.

playbooks/roles/jenkins_worker/tasks/test_sitespeed_worker.yml

@@ -12,4 +12,4 @@
   register: firefox_version
 - assert:
     that:
-      - "'40.0' not in firefox_version"
+      - "'28.0' not in firefox_version.stdout"

playbooks/roles/test_build_server/files/test-development-environment.sh

@@ -22,8 +22,7 @@ source scripts/jenkins-common.sh
 
 # Now we can run a subset of the tests via paver.
 # Run some of the common/lib unit tests
-# TODO: The following verification is waiting on a fix for SOL-570.
-# paver test_lib -t common/lib/xmodule/xmodule/tests/test_stringify.py
+paver test_lib -t common/lib/xmodule/xmodule/tests/test_stringify.py
 
 # Generate some coverage reports
 paver coverage
@@ -36,8 +35,7 @@ paver test_system -t cms/djangoapps/course_creators/tests/test_views.py
 paver test_js_run -s xmodule
 
 # Run some of the bok-choy tests
-paver test_bokchoy -t lms/test_lms.py:LanguageTest
-paver test_bokchoy -t discussion/test_discussion.py:DiscussionTabSingleThreadTest --fasttest
+paver test_bokchoy -t discussion/test_discussion.py:DiscussionTabSingleThreadTest
 paver test_bokchoy -t studio/test_studio_with_ora_component.py:ORAComponentTest --fasttest
 paver test_bokchoy -t lms/test_lms_matlab_problem.py:MatlabProblemTest --fasttest