Revert "SERVER-39311 Enable burn_in repetition count: at least 2 executions, with a maximum of 1000 excutions or 10 minutes of execution time"

This reverts commit df4243e71b7c69c4da59c90e657f0749d6c9c979.

1 files changed, 42 insertions, 42 deletions

diff --git a/buildscripts/tests/ciconfig/test_evergreen.py b/buildscripts/tests/ciconfig/test_evergreen.py
index fd57a449f79..d7b345ca144 100644
--- a/buildscripts/tests/ciconfig/test_evergreen.py
+++ b/buildscripts/tests/ciconfig/test_evergreen.py
@@ -71,7 +71,7 @@ class TestEvergreenProjectConfig(unittest.TestCase):
         self.assertIn("amazon", self.conf.distro_names)
 
 
-class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
+class TestTask(unittest.TestCase):  #pylint: disable=too-many-public-methods
     """Unit tests for the Task class."""
 
     def test_from_dict(self):
@@ -147,6 +147,19 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         self.assertIsNone(task.multiversion_setup_command)
         self.assertIsNone(task.multiversion_path)
 
+    def test_get_vars_suite_name_run_tests(self):
+        suite_name = "core"
+        task_commands = [{
+            "func": "run tests",
+            "vars": {"resmoke_args": "--suites={} --shellWriteMode=commands".format(suite_name)}
+        }]
+
+        task_dict = {"name": "jsCore", "commands": task_commands}
+        task = _evergreen.Task(task_dict)
+
+        with self.assertRaises(ValueError):
+            task.get_vars_suite_name(task_commands[0]["vars"])
+
     def test_resmoke_args_gen(self):
         task_name = "core"
         task_commands = [{
@@ -239,46 +252,6 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         self.assertDictEqual(task_commands[0], task.generate_resmoke_tasks_command)
         self.assertEqual(task_name, task.get_vars_task_name(task_commands[0]["vars"]))
 
-    def test_gen_resmoke_multiversion(self):
-        multiversion_path = "/data/multiversion"
-        task_name = "core"
-        task_commands = [{
-            "func": "generate resmoke tasks", "vars": {
-                "task": task_name, "resmoke_args": "--shellWriteMode=commands",
-                "use_multiversion": multiversion_path
-            }
-        }]
-        task_dict = {"name": "jsCore", "commands": task_commands}
-        task = _evergreen.Task(task_dict)
-
-        self.assertTrue(task.is_multiversion_task)
-        self.assertEqual(multiversion_path, task.multiversion_path)
-
-    def test_gen_resmoke_no_multiversion(self):
-        task_name = "core"
-        task_commands = [{
-            "func": "generate resmoke tasks",
-            "vars": {"task": task_name, "resmoke_args": "--shellWriteMode=commands"}
-        }]
-        task_dict = {"name": "jsCore", "commands": task_commands}
-        task = _evergreen.Task(task_dict)
-
-        self.assertFalse(task.is_multiversion_task)
-        self.assertIsNone(task.multiversion_path)
-
-    def test_get_vars_suite_name_run_tests(self):
-        suite_name = "core"
-        task_commands = [{
-            "func": "run tests",
-            "vars": {"resmoke_args": "--suites={} --shellWriteMode=commands".format(suite_name)}
-        }]
-
-        task_dict = {"name": "jsCore", "commands": task_commands}
-        task = _evergreen.Task(task_dict)
-
-        with self.assertRaises(ValueError):
-            task.get_vars_suite_name(task_commands[0]["vars"])
-
     def test_get_vars_suite_name_generate_resmoke_tasks(self):
         task_name = "jsCore"
         suite_name = "core"
@@ -301,7 +274,7 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         with self.assertRaises(TypeError):
             task.get_vars_suite_name(None)
 
-    def test_get_vars_suite_name_gen_resmoke_notask_nosuite(self):
+    def test_get_vars_suite_name_gen_resmoke_notasksuite(self):
         task_name = "jsCore"
         task_commands = [{
             "func": "generate resmoke tasks", "vars": {"resmoke_args": "--shellWriteMode=commands"}
@@ -312,6 +285,33 @@ class TestTask(unittest.TestCase):  # pylint: disable=too-many-public-methods
         with self.assertRaises(ValueError):
             task.get_vars_suite_name(task_commands[0]["vars"])
 
+    def test_gen_resmoke_multiversion(self):
+        multiversion_path = "/data/multiversion"
+        task_name = "core"
+        task_commands = [{
+            "func": "generate resmoke tasks", "vars": {
+                "task": task_name, "resmoke_args": "--shellWriteMode=commands",
+                "use_multiversion": multiversion_path
+            }
+        }]
+        task_dict = {"name": "jsCore", "commands": task_commands}
+        task = _evergreen.Task(task_dict)
+
+        self.assertTrue(task.is_multiversion_task)
+        self.assertEqual(multiversion_path, task.multiversion_path)
+
+    def test_gen_resmoke_no_multiversion(self):
+        task_name = "core"
+        task_commands = [{
+            "func": "generate resmoke tasks",
+            "vars": {"task": task_name, "resmoke_args": "--shellWriteMode=commands"}
+        }]
+        task_dict = {"name": "jsCore", "commands": task_commands}
+        task = _evergreen.Task(task_dict)
+
+        self.assertFalse(task.is_multiversion_task)
+        self.assertIsNone(task.multiversion_path)
+
     def test_get_vars_task_name(self):
         task_name = "task_name"
         task_commands = [{