Merge pull request #16649 from edx/bmedx/django111_tag_test_failures_lms_1

Tag LMS Unit 1 tests that fail in Django 1.11

openedx/tests/xblock_integration/test_crowdsource_hinter.py

@@ -4,6 +4,7 @@ Test scenarios for the crowdsource hinter xblock.
 import json
 import unittest
 
+import pytest
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from nose.plugins.attrib import attr
@@ -135,6 +136,7 @@ class TestCrowdsourceHinter(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
 
 
 @attr(shard=1)
+@pytest.mark.django111_expected_failure
 class TestHinterFunctions(TestCrowdsourceHinter):
     """
     Check that the essential functions of the hinter work as expected.

openedx/tests/xblock_integration/test_recommender.py

@@ -9,13 +9,14 @@ import StringIO
 import unittest
 from copy import deepcopy
 
-from ddt import data, ddt
+import pytest
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from nose.plugins.attrib import attr
 
+from ddt import data, ddt
 from lms.djangoapps.courseware.tests.factories import GlobalStaffFactory
 from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase
+from nose.plugins.attrib import attr
 from openedx.core.lib.url_utils import quote_slashes
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
@@ -196,6 +197,7 @@ class TestRecommender(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
 
 
 @attr(shard=1)
+@pytest.mark.django111_expected_failure
 class TestRecommenderCreateFromEmpty(TestRecommender):
     """
     Check whether we can add resources to an empty database correctly
@@ -256,6 +258,7 @@ class TestRecommenderResourceBase(TestRecommender):
 
 
 @attr(shard=1)
+@pytest.mark.django111_expected_failure
 class TestRecommenderWithResources(TestRecommenderResourceBase):
     """
     Check whether we can add/edit/flag/export resources correctly
@@ -422,6 +425,7 @@ class TestRecommenderWithResources(TestRecommenderResourceBase):
 
 @attr(shard=1)
 @ddt
+@pytest.mark.django111_expected_failure
 class TestRecommenderVoteWithResources(TestRecommenderResourceBase):
     """
     Check whether we can vote resources correctly
@@ -536,6 +540,7 @@ class TestRecommenderVoteWithResources(TestRecommenderResourceBase):
 
 @attr(shard=1)
 @ddt
+@pytest.mark.django111_expected_failure
 class TestRecommenderStaffFeedbackWithResources(TestRecommenderResourceBase):
     """
     Check whether we can remove/endorse resources correctly
@@ -631,6 +636,7 @@ class TestRecommenderStaffFeedbackWithResources(TestRecommenderResourceBase):
 
 @attr(shard=1)
 @ddt
+@pytest.mark.django111_expected_failure
 class TestRecommenderFileUploading(TestRecommender):
     """
     Check whether we can handle file uploading correctly