Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22618 from open-craft/giovanni/remove-python3-flaky-test

Browse Source 
BB-1744: Remove flaky test related to MockS3Mixin [FOLLOW-UP]
This commit is contained in:
Feanil Patel
2019-12-27 10:34:28 -05:00
committed by GitHub
parent 99e31ab4ae d1aeec45ad
commit 1b1de5c1ab
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lms/djangoapps/verify_student/management/commands/tests/test_send_verification_expiry_email.py
View File

@@ -14,12 +14,10 @@ from django.core.management import call_command, CommandError
from django.test.utils import override_settings
from django.utils.timezone import now
from mock import patch
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from student.tests.factories import UserFactory
from testfixtures import LogCapture
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory
from common.test.utils import MockS3Mixin, py2_only
from common.test.utils import MockS3Mixin
from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
from lms.djangoapps.verify_student.tests.test_models import FAKE_SETTINGS, mock_software_secure_post
@@ -28,7 +26,7 @@ LOGGER_NAME = 'lms.djangoapps.verify_student.management.commands.send_verificati
@patch.dict(settings.VERIFY_STUDENT, FAKE_SETTINGS)
@patch('lms.djangoapps.verify_student.models.requests.post', new=mock_software_secure_post)
class TestSendVerificationExpiryEmail(MockS3Mixin, ModuleStoreTestCase):
class TestSendVerificationExpiryEmail(MockS3Mixin):
""" Tests for django admin command `send_verification_expiry_email` in the verify_student module """
def setUp(self):
@@ -206,30 +204,6 @@ class TestSendVerificationExpiryEmail(MockS3Mixin, ModuleStoreTestCase):
self.assertEqual(len(mail.outbox), 1)
self.assertIsNone(attempt.expiry_email_date)
@py2_only
def test_user_enrolled_in_verified_course(self):
"""
Test that if the user is enrolled in verified track, then after sending the default no of
emails, `expiry_email_date` is updated to now() so that it's filtered in the future to send
email again.
Does not work on python 3 with the latest mongo driver version due to class inheritance issues.
"""
user = UserFactory.create()
course = CourseFactory()
CourseEnrollmentFactory.create(user=user, course_id=course.id, mode='verified')
today = now().replace(hour=0, minute=0, second=0, microsecond=0)
verification = self.create_and_submit(user)
verification.status = 'approved'
verification.expiry_date = now() - timedelta(days=self.resend_days * (self.default_no_of_emails - 1))
verification.expiry_email_date = today - timedelta(days=self.resend_days)
verification.save()
call_command('send_verification_expiry_email')
attempt = SoftwareSecurePhotoVerification.objects.get(pk=verification.id)
self.assertEqual(attempt.expiry_email_date, today)
def test_number_of_emails_sent(self):
"""
Tests that the number of emails sent in case the user is only enrolled in audit track are same