From 5ae4681bd87ef1ec8a832001e2fb3af4396b6a80 Mon Sep 17 00:00:00 2001
From: Christine Lytwynec <clytwynec@edx.org>
Date: Wed, 4 Feb 2015 13:47:01 -0500
Subject: [PATCH 1/2] re-shard cms lettuce tests back to 2 shards

---
 cms/djangoapps/contentstore/features/transcripts.feature | 2 +-
 cms/djangoapps/contentstore/features/video.feature       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/transcripts.feature b/cms/djangoapps/contentstore/features/transcripts.feature
index 579d648607..5aa6405774 100644
--- a/cms/djangoapps/contentstore/features/transcripts.feature
+++ b/cms/djangoapps/contentstore/features/transcripts.feature
@@ -1,4 +1,4 @@
-@shard_3 @requires_stub_youtube
+@shard_1 @requires_stub_youtube
 Feature: CMS Transcripts
   As a course author, I want to be able to create video components
 
diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature
index 5992c2540c..59dc89f6eb 100644
--- a/cms/djangoapps/contentstore/features/video.feature
+++ b/cms/djangoapps/contentstore/features/video.feature
@@ -1,4 +1,4 @@
-@shard_3 @requires_stub_youtube
+@shard_2 @requires_stub_youtube
 Feature: CMS Video Component
   As a course author, I want to be able to view my created videos in Studio
 

From 4f218941a3fb28bf882ce6f7e7a2175bf54fa00c Mon Sep 17 00:00:00 2001
From: Christine Lytwynec <clytwynec@edx.org>
Date: Thu, 5 Feb 2015 15:21:16 -0500
Subject: [PATCH 2/2] reshard cms lettuce tests back to 1 shard

---
 scripts/all-tests.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index 8acc2c58e4..4ba0fc89b6 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -156,13 +156,20 @@ END
     "cms-acceptance")
         case "$SHARD" in
 
-            "all")
+            "all"|"1")
                 paver test_acceptance -s cms --extra_args="-v 3"
                 ;;
 
-            *)
-                paver test_acceptance -s cms --extra_args="-v 3 --tag shard_${SHARD}"
+            "2"|"3")
+                mkdir -p reports/acceptance
+                cat > reports/acceptance/xunit.xml <<END
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="nosetests" tests="1" errors="0" failures="0" skip="0">
+<testcase classname="lettuce.tests" name="shard_placeholder" time="0.001"></testcase>
+</testsuite>
+END
                 ;;
+
         esac
         ;;