Remove nonrequired conditions
This commit is contained in:
@@ -951,10 +951,6 @@ class CategoryMapTestCase(CategoryMapTestMixin, ModuleStoreTestCase):
|
||||
}
|
||||
)
|
||||
|
||||
@pytest.mark.skipif(
|
||||
sys.version_info < (3, 7),
|
||||
reason="Python 3.7 sorted dict insertion is considered"
|
||||
)
|
||||
def test_sort_intermediates(self):
|
||||
self.create_discussion("Chapter B", "Discussion 2")
|
||||
self.create_discussion("Chapter C", "Discussion")
|
||||
@@ -1015,70 +1011,6 @@ class CategoryMapTestCase(CategoryMapTestMixin, ModuleStoreTestCase):
|
||||
}
|
||||
)
|
||||
|
||||
@pytest.mark.skipif(
|
||||
sys.version_info >= (3, 7),
|
||||
reason="Python 3.7 sorted dict insertion is not considered"
|
||||
)
|
||||
def test_sort_intermediates(self):
|
||||
self.create_discussion("Chapter B", "Discussion 2")
|
||||
self.create_discussion("Chapter C", "Discussion")
|
||||
self.create_discussion("Chapter A", "Discussion 1")
|
||||
self.create_discussion("Chapter B", "Discussion 1")
|
||||
self.create_discussion("Chapter A", "Discussion 2")
|
||||
|
||||
self.assert_category_map_equals(
|
||||
{
|
||||
"entries": {},
|
||||
"subcategories": {
|
||||
"Chapter A": {
|
||||
"entries": {
|
||||
"Discussion 1": {
|
||||
"id": "discussion3",
|
||||
"sort_key": None,
|
||||
"is_divided": False,
|
||||
},
|
||||
"Discussion 2": {
|
||||
"id": "discussion5",
|
||||
"sort_key": None,
|
||||
"is_divided": False,
|
||||
}
|
||||
},
|
||||
"subcategories": {},
|
||||
"children": [("Discussion 1", TYPE_ENTRY), ("Discussion 2", TYPE_ENTRY)]
|
||||
},
|
||||
"Chapter B": {
|
||||
"entries": {
|
||||
"Discussion 1": {
|
||||
"id": "discussion4",
|
||||
"sort_key": None,
|
||||
"is_divided": False,
|
||||
},
|
||||
"Discussion 2": {
|
||||
"id": "discussion1",
|
||||
"sort_key": None,
|
||||
"is_divided": False,
|
||||
}
|
||||
},
|
||||
"subcategories": {},
|
||||
"children": [("Discussion 1", TYPE_ENTRY), ("Discussion 2", TYPE_ENTRY)]
|
||||
},
|
||||
"Chapter C": {
|
||||
"entries": {
|
||||
"Discussion": {
|
||||
"id": "discussion2",
|
||||
"sort_key": None,
|
||||
"is_divided": False,
|
||||
}
|
||||
},
|
||||
"subcategories": {},
|
||||
"children": [("Discussion", TYPE_ENTRY)]
|
||||
}
|
||||
},
|
||||
"children": [("Chapter A", TYPE_SUBCATEGORY), ("Chapter B", TYPE_SUBCATEGORY),
|
||||
("Chapter C", TYPE_SUBCATEGORY)]
|
||||
}
|
||||
)
|
||||
|
||||
def test_ids_empty(self):
|
||||
self.assertEqual(utils.get_discussion_categories_ids(self.course, self.user), [])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user