From 2e4bba0a7945c390780a40ec5b20b394ebfb94b9 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Tue, 8 Dec 2015 17:25:49 -0500 Subject: [PATCH] Remove ORA1 test units from xmodule test courses --- .../tests/test_mongo_call_count.py | 24 ++--- .../d68c2861c10a4c9d92a679b4cfc0f924.xml | 7 -- .../3b04d935c8d945c3900708279fb24892.xml | 93 ----------------- .../b3aa2db471a9412fbc96302f2e5ea983.xml | 99 ------------------- .../ecfe4fa774ff48d089ae84daa1f6cc75.xml | 93 ----------------- .../manual-testing-complete/course/2014.xml | 3 +- .../ecfe4fa774ff48d089ae84daa1f6cc75.xml | 93 ----------------- .../5887a034ad17480393c5ebca4b8fd1d4.xml | 3 - .../policies/2014/policy.json | 2 +- .../4eadf76912cd436b9d698c8759784d8d.xml | 3 - .../5c33f2c2b3aa45f5bfbf7bf7f9bcb2ff.xml | 3 - .../b7ebe0f048e9466e9ef32e7815fb5a93.xml | 3 - .../4502126328484ed58c87e7ba3b0fa21d.xml | 3 - .../5887a034ad17480393c5ebca4b8fd1d4.xml | 3 - .../e34798bf546a4178ab76afe3a5f729af.xml | 3 - common/test/data/toy/peergrading/init.xml | 1 - 16 files changed, 14 insertions(+), 422 deletions(-) delete mode 100644 common/test/data/manual-testing-complete/chapter/d68c2861c10a4c9d92a679b4cfc0f924.xml delete mode 100644 common/test/data/manual-testing-complete/combinedopenended/3b04d935c8d945c3900708279fb24892.xml delete mode 100644 common/test/data/manual-testing-complete/combinedopenended/b3aa2db471a9412fbc96302f2e5ea983.xml delete mode 100644 common/test/data/manual-testing-complete/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml delete mode 100644 common/test/data/manual-testing-complete/drafts/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml delete mode 100644 common/test/data/manual-testing-complete/drafts/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml delete mode 100644 common/test/data/manual-testing-complete/sequential/4eadf76912cd436b9d698c8759784d8d.xml delete mode 100644 common/test/data/manual-testing-complete/sequential/5c33f2c2b3aa45f5bfbf7bf7f9bcb2ff.xml delete mode 100644 common/test/data/manual-testing-complete/sequential/b7ebe0f048e9466e9ef32e7815fb5a93.xml delete mode 100644 common/test/data/manual-testing-complete/vertical/4502126328484ed58c87e7ba3b0fa21d.xml delete mode 100644 common/test/data/manual-testing-complete/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml delete mode 100644 common/test/data/manual-testing-complete/vertical/e34798bf546a4178ab76afe3a5f729af.xml delete mode 100644 common/test/data/toy/peergrading/init.xml diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py index 4e9b336bc8..b7384575ff 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py @@ -95,27 +95,27 @@ class CountMongoCallsCourseTraversal(TestCase): # These two lines show the way this traversal *should* be done # (if you'll eventually access all the fields and load all the definitions anyway). # 'lazy' does not matter in old Mongo. - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, False, True, 189), - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, True, True, 189), - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, False, True, 387), - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, True, True, 387), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, False, True, 175), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, True, True, 175), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, False, True, 359), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, True, True, 359), # As shown in these two lines: whether or not the XBlock fields are accessed, # the same number of mongo calls are made in old Mongo for depth=None. - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, False, False, 189), - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, True, False, 189), - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, False, False, 387), - (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, True, False, 387), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, False, False, 175), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, None, True, False, 175), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, False, False, 359), + (MIXED_OLD_MONGO_MODULESTORE_BUILDER, 0, True, False, 359), # The line below shows the way this traversal *should* be done # (if you'll eventually access all the fields and load all the definitions anyway). (MIXED_SPLIT_MODULESTORE_BUILDER, None, False, True, 4), - (MIXED_SPLIT_MODULESTORE_BUILDER, None, True, True, 41), - (MIXED_SPLIT_MODULESTORE_BUILDER, 0, False, True, 143), - (MIXED_SPLIT_MODULESTORE_BUILDER, 0, True, True, 41), + (MIXED_SPLIT_MODULESTORE_BUILDER, None, True, True, 38), + (MIXED_SPLIT_MODULESTORE_BUILDER, 0, False, True, 131), + (MIXED_SPLIT_MODULESTORE_BUILDER, 0, True, True, 38), (MIXED_SPLIT_MODULESTORE_BUILDER, None, False, False, 4), (MIXED_SPLIT_MODULESTORE_BUILDER, None, True, False, 4), # TODO: The call count below seems like a bug - should be 4? # Seems to be related to using self.lazy in CachingDescriptorSystem.get_module_data(). - (MIXED_SPLIT_MODULESTORE_BUILDER, 0, False, False, 143), + (MIXED_SPLIT_MODULESTORE_BUILDER, 0, False, False, 131), (MIXED_SPLIT_MODULESTORE_BUILDER, 0, True, False, 4) ) @ddt.unpack diff --git a/common/test/data/manual-testing-complete/chapter/d68c2861c10a4c9d92a679b4cfc0f924.xml b/common/test/data/manual-testing-complete/chapter/d68c2861c10a4c9d92a679b4cfc0f924.xml deleted file mode 100644 index a68da5ff12..0000000000 --- a/common/test/data/manual-testing-complete/chapter/d68c2861c10a4c9d92a679b4cfc0f924.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/common/test/data/manual-testing-complete/combinedopenended/3b04d935c8d945c3900708279fb24892.xml b/common/test/data/manual-testing-complete/combinedopenended/3b04d935c8d945c3900708279fb24892.xml deleted file mode 100644 index 4d0d3ceb22..0000000000 --- a/common/test/data/manual-testing-complete/combinedopenended/3b04d935c8d945c3900708279fb24892.xml +++ /dev/null @@ -1,93 +0,0 @@ - - -

Censorship in the Libraries

-

'All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us.' --Katherine Paterson, Author -

-

- Write a persuasive essay to a newspaper reflecting your views on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading. -

- - - - - -Ideas - - - - - - - - -Content - - - - - - - - -Organization - - - - - - - -Style - - - - - - - -Voice - - - - - - - - - - - diff --git a/common/test/data/manual-testing-complete/combinedopenended/b3aa2db471a9412fbc96302f2e5ea983.xml b/common/test/data/manual-testing-complete/combinedopenended/b3aa2db471a9412fbc96302f2e5ea983.xml deleted file mode 100644 index 3586beaa2e..0000000000 --- a/common/test/data/manual-testing-complete/combinedopenended/b3aa2db471a9412fbc96302f2e5ea983.xml +++ /dev/null @@ -1,99 +0,0 @@ - - -

Censorship in the Libraries

-

'All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us.' --Katherine Paterson, Author -

-

- Write a persuasive essay to a newspaper reflecting your views on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading. -

- - - - - -Ideas - - - - - - - - -Content - - - - - - - - -Organization - - - - - - - -Style - - - - - - - -Voice - - - - - - - - - - - Enter essay here. - This is the answer. - {"grader_settings" : "peer_grading.conf", "problem_id" : "6.002x/Welcome/OETest"} - - - - diff --git a/common/test/data/manual-testing-complete/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml b/common/test/data/manual-testing-complete/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml deleted file mode 100644 index b135c09760..0000000000 --- a/common/test/data/manual-testing-complete/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml +++ /dev/null @@ -1,93 +0,0 @@ - - -

Censorship in the Libraries

-

'All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us.' --Katherine Paterson, Author -

-

- Write a persuasive essay to a newspaper reflecting your views on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading. -

- - - - - -Ideas - - - - - - - - -Content - - - - - - - - -Organization - - - - - - - -Style - - - - - - - -Voice - - - - - - - - - - - diff --git a/common/test/data/manual-testing-complete/course/2014.xml b/common/test/data/manual-testing-complete/course/2014.xml index 8c88a504cb..54b6f7b91f 100644 --- a/common/test/data/manual-testing-complete/course/2014.xml +++ b/common/test/data/manual-testing-complete/course/2014.xml @@ -1,6 +1,5 @@ - + - diff --git a/common/test/data/manual-testing-complete/drafts/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml b/common/test/data/manual-testing-complete/drafts/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml deleted file mode 100644 index 4d0d3ceb22..0000000000 --- a/common/test/data/manual-testing-complete/drafts/combinedopenended/ecfe4fa774ff48d089ae84daa1f6cc75.xml +++ /dev/null @@ -1,93 +0,0 @@ - - -

Censorship in the Libraries

-

'All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us.' --Katherine Paterson, Author -

-

- Write a persuasive essay to a newspaper reflecting your views on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading. -

- - - - - -Ideas - - - - - - - - -Content - - - - - - - - -Organization - - - - - - - -Style - - - - - - - -Voice - - - - - - - - - - - diff --git a/common/test/data/manual-testing-complete/drafts/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml b/common/test/data/manual-testing-complete/drafts/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml deleted file mode 100644 index 573af5cb85..0000000000 --- a/common/test/data/manual-testing-complete/drafts/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/policies/2014/policy.json b/common/test/data/manual-testing-complete/policies/2014/policy.json index a264498fdc..ae60a14a32 100644 --- a/common/test/data/manual-testing-complete/policies/2014/policy.json +++ b/common/test/data/manual-testing-complete/policies/2014/policy.json @@ -1 +1 @@ -{"course/2014": {"advanced_modules": ["annotatable", "combinedopenended", "peergrading", "lti", "word_cloud"], "show_calculator": true, "display_name": "Manual Smoke Test Course 1", "tabs": [{"type": "courseware", "name": "Courseware"}, {"type": "course_info", "name": "Course Info"}, {"type": "textbooks", "name": "Textbooks"}, {"type": "discussion", "name": "Discussion"}, {"type": "wiki", "name": "Wiki"}, {"type": "progress", "name": "Progress"}, {"type": "pdf_textbooks", "name": "Textbooks"}, {"type": "open_ended", "name": "Open Ended Panel"}], "discussion_topics": {"General": {"id": "i4x-ManTestX-ManTest1-course-2014"}}, "start": "2014-06-26T00:00:00Z", "pdf_textbooks": [{"tab_title": "An Example Paper", "id": "0An_Example_Paper", "chapters": [{"url": "/static/1.pdf", "title": "Introduction "}]}], "lti_passports": ["ims:12345:secret"]}} +{"course/2014": {"advanced_modules": ["annotatable", "lti", "word_cloud"], "show_calculator": true, "display_name": "Manual Smoke Test Course 1", "tabs": [{"type": "courseware", "name": "Courseware"}, {"type": "course_info", "name": "Course Info"}, {"type": "textbooks", "name": "Textbooks"}, {"type": "discussion", "name": "Discussion"}, {"type": "wiki", "name": "Wiki"}, {"type": "progress", "name": "Progress"}, {"type": "pdf_textbooks", "name": "Textbooks"}], "discussion_topics": {"General": {"id": "i4x-ManTestX-ManTest1-course-2014"}}, "start": "2014-06-26T00:00:00Z", "pdf_textbooks": [{"tab_title": "An Example Paper", "id": "0An_Example_Paper", "chapters": [{"url": "/static/1.pdf", "title": "Introduction "}]}], "lti_passports": ["ims:12345:secret"]}} diff --git a/common/test/data/manual-testing-complete/sequential/4eadf76912cd436b9d698c8759784d8d.xml b/common/test/data/manual-testing-complete/sequential/4eadf76912cd436b9d698c8759784d8d.xml deleted file mode 100644 index 798ad29ca0..0000000000 --- a/common/test/data/manual-testing-complete/sequential/4eadf76912cd436b9d698c8759784d8d.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/sequential/5c33f2c2b3aa45f5bfbf7bf7f9bcb2ff.xml b/common/test/data/manual-testing-complete/sequential/5c33f2c2b3aa45f5bfbf7bf7f9bcb2ff.xml deleted file mode 100644 index 57d9bf8664..0000000000 --- a/common/test/data/manual-testing-complete/sequential/5c33f2c2b3aa45f5bfbf7bf7f9bcb2ff.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/sequential/b7ebe0f048e9466e9ef32e7815fb5a93.xml b/common/test/data/manual-testing-complete/sequential/b7ebe0f048e9466e9ef32e7815fb5a93.xml deleted file mode 100644 index d88f4d68b3..0000000000 --- a/common/test/data/manual-testing-complete/sequential/b7ebe0f048e9466e9ef32e7815fb5a93.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/vertical/4502126328484ed58c87e7ba3b0fa21d.xml b/common/test/data/manual-testing-complete/vertical/4502126328484ed58c87e7ba3b0fa21d.xml deleted file mode 100644 index 974d81d1ad..0000000000 --- a/common/test/data/manual-testing-complete/vertical/4502126328484ed58c87e7ba3b0fa21d.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml b/common/test/data/manual-testing-complete/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml deleted file mode 100644 index a34af38eb8..0000000000 --- a/common/test/data/manual-testing-complete/vertical/5887a034ad17480393c5ebca4b8fd1d4.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/vertical/e34798bf546a4178ab76afe3a5f729af.xml b/common/test/data/manual-testing-complete/vertical/e34798bf546a4178ab76afe3a5f729af.xml deleted file mode 100644 index 8147a41ae3..0000000000 --- a/common/test/data/manual-testing-complete/vertical/e34798bf546a4178ab76afe3a5f729af.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/toy/peergrading/init.xml b/common/test/data/toy/peergrading/init.xml deleted file mode 100644 index 2fe3a8fd85..0000000000 --- a/common/test/data/toy/peergrading/init.xml +++ /dev/null @@ -1 +0,0 @@ -