From 4840f8c5684b79dbcb70219e5534a4accb8cdc8a Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 15 Jun 2016 09:51:43 -0400 Subject: [PATCH 1/2] Don't try and cleanup a directory that doesn't exist (in badging tests) --- lms/djangoapps/badges/tests/test_models.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/djangoapps/badges/tests/test_models.py b/lms/djangoapps/badges/tests/test_models.py index c27308c84e..f3e82af8b7 100644 --- a/lms/djangoapps/badges/tests/test_models.py +++ b/lms/djangoapps/badges/tests/test_models.py @@ -77,9 +77,10 @@ class BadgeClassTest(ModuleStoreTestCase): Remove all files uploaded as badges. """ upload_to = BadgeClass._meta.get_field('image').upload_to # pylint: disable=protected-access - (_, files) = default_storage.listdir(upload_to) - for uploaded_file in files: - default_storage.delete(upload_to + '/' + uploaded_file) + if default_storage.exists(upload_to): + (_, files) = default_storage.listdir(upload_to) + for uploaded_file in files: + default_storage.delete(upload_to + '/' + uploaded_file) # Need full path to make sure class names line up. @override_settings(BADGING_BACKEND='lms.djangoapps.badges.tests.test_models.DummyBackend') From 5e11f86ed7aa7e0411c458c79163ecf9e3e03f0c Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 15 Jun 2016 13:49:52 -0400 Subject: [PATCH 2/2] Remove flaky-test marker from badges tests --- lms/djangoapps/badges/tests/test_models.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lms/djangoapps/badges/tests/test_models.py b/lms/djangoapps/badges/tests/test_models.py index f3e82af8b7..87745cb258 100644 --- a/lms/djangoapps/badges/tests/test_models.py +++ b/lms/djangoapps/badges/tests/test_models.py @@ -7,7 +7,6 @@ from django.core.files.storage import default_storage from django.db.utils import IntegrityError from django.test import TestCase from django.test.utils import override_settings -from flaky import flaky from mock import patch, Mock from nose.plugins.attrib import attr from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase @@ -217,7 +216,6 @@ class BadgeClassTest(ModuleStoreTestCase): self.assertTrue(mock_award.called) mock_award.assert_called_with(badge_class, user, evidence_url='http://example.com/evidence') - @flaky # ECOM-4713 def test_runs_validator(self): """ Verify that the image validator is triggered when cleaning the model.