Merge pull request #3112 from edx/zoldak/skip-failing-tests

Temporarily disable the bok-choy test that is intermittently failing

common/test/acceptance/tests/test_studio.py

@@ -225,6 +225,7 @@ class XBlockAcidParentBase(XBlockAcidBase):
         super(XBlockAcidParentBase, self).validate_acid_block_preview(acid_block)
         self.assertTrue(acid_block.child_tests_passed)
 
+    @skip('Intermittently failing, needs a better page definition that waits until the unit is fully rendered')
     def test_acid_block_preview(self):
         """
         Verify that all expected acid block tests pass in studio preview