resolved git error that arose with auto-merging

Author: janvanrijn

tests/test_runs/test_run_functions.py

@@ -166,7 +166,9 @@ def test_run_optimize_bagging_diabetes(self):
 
         run = self._perform_run(task_id, num_test_instances, grid_search)
         self.assertEqual(len(run.trace_content), num_iterations * num_folds)
-    
+        res = self._check_serialized_optimized_run(run.run_id)
+        self.assertTrue(res)
+
     def test_run_with_classifiers_in_param_grid(self):
         task = openml.tasks.get_task(115)
 
@@ -178,10 +180,6 @@ def test_run_with_classifiers_in_param_grid(self):
         self.assertRaises(TypeError, openml.runs.run_task,
                           task=task, model=clf, avoid_duplicate_runs=False)
 
-
-        res = self._check_serialized_optimized_run(run.run_id)
-        self.assertTrue(res)
-
     def test_run_pipeline(self):
         task_id = 115
         num_instances = 768