Merge pull request #13676 from edx/release-10-06-conflict

Merge release to master

openedx/core/lib/xblock_utils/test_utils.py

@@ -0,0 +1,26 @@
+"""
+Utilities for testing xblocks
+"""
+
+from django.conf import settings
+
+from xmodule.modulestore.tests.factories import ItemFactory
+
+TEST_DATA_DIR = settings.COMMON_ROOT / u'test/data'
+
+
+def add_xml_block_from_file(block_type, filename, parent, metadata):
+    """
+    Create a block of the specified type with content included from the
+    specified XML file.
+
+    XML filenames are relative to common/test/data/blocks.
+    """
+    with open(TEST_DATA_DIR / u'blocks' / filename) as datafile:
+        return ItemFactory.create(
+            parent=parent,
+            category=block_type,
+            data=datafile.read().decode('utf-8'),
+            metadata=metadata,
+            display_name=u'problem'
+        )