Commit b2139ece by Tim Babych

Merge pull request #4543 from edx/tim/test_export_all_courses-was-flaky

Make test_export_all_courses not flaky
parents fa1f4f2b 51a8dc23
......@@ -43,8 +43,7 @@ class ExportAllCourses(ModuleStoreTestCase):
# check that there are two assets ['example.txt', '.example.txt'] in contentstore for imported course
all_assets, count = self.content_store.get_all_content_for_course(course.id)
self.assertEqual(count, 2)
self.assertEqual(all_assets[0]['_id']['name'], u'.example.txt')
self.assertEqual(all_assets[1]['_id']['name'], u'example.txt')
self.assertEqual(set([asset['_id']['name'] for asset in all_assets]), set([u'.example.txt', u'example.txt']))
# manually add redundant assets (file ".DS_Store" and filename starts with "._")
course_filter = course.id.make_asset_key("asset", None)
......@@ -59,14 +58,12 @@ class ExportAllCourses(ModuleStoreTestCase):
# check that now course has four assets
all_assets, count = self.content_store.get_all_content_for_course(course.id)
self.assertEqual(count, 4)
self.assertEqual(all_assets[0]['_id']['name'], u'.example.txt')
self.assertEqual(all_assets[1]['_id']['name'], u'example.txt')
self.assertEqual(all_assets[2]['_id']['name'], u'._example_test.txt')
self.assertEqual(all_assets[3]['_id']['name'], u'.DS_Store')
self.assertEqual(
set([asset['_id']['name'] for asset in all_assets]),
set([u'.example.txt', u'example.txt', u'._example_test.txt', u'.DS_Store'])
)
# now call asset_cleanup command and check that there is only two proper assets in contentstore for the course
call_command('cleanup_assets')
all_assets, count = self.content_store.get_all_content_for_course(course.id)
self.assertEqual(count, 2)
self.assertEqual(all_assets[0]['_id']['name'], u'.example.txt')
self.assertEqual(all_assets[1]['_id']['name'], u'example.txt')
self.assertEqual(set([asset['_id']['name'] for asset in all_assets]), set([u'.example.txt', u'example.txt']))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment