fix unittest (?)

Author: janvanrijn

tests/test_runs/test_run_functions.py

@@ -714,24 +714,18 @@ def test_run_with_classifiers_in_param_grid(self):
                           task=task, model=clf, avoid_duplicate_runs=False)
 
     def test__run_task_get_arffcontent(self):
-        task = openml.tasks.get_task(7)
-        num_instances = 320
-        num_folds = 1
+        task = openml.tasks.get_task(11)
+        num_instances = 3196
+        num_folds = 10
         num_repeats = 1
 
         clf = SGDClassifier(loss='log', random_state=1)
-        res = openml.runs.functions._run_model_on_fold(clf, task, 0, 0, 0, True)
-
-        arff_datacontent, arff_tracecontent, user_defined_measures, model = res
+        res = openml.runs.functions._run_task_get_arffcontent(clf, task)
+        arff_datacontent, arff_tracecontent, _, fold_evaluations, sample_evaluations = res
         # predictions
         self.assertIsInstance(arff_datacontent, list)
         # trace. SGD does not produce any
-        self.assertIsInstance(arff_tracecontent, list)
-        self.assertEquals(len(arff_tracecontent), 0)
-
-        fold_evaluations = collections.defaultdict(lambda: collections.defaultdict(dict))
-        for measure in user_defined_measures:
-            fold_evaluations[measure][0][0] = user_defined_measures[measure]
+        self.assertIsInstance(arff_tracecontent, type(None))
 
         self._check_fold_evaluations(fold_evaluations, num_repeats, num_folds)
 
@@ -755,18 +749,24 @@ def test__run_task_get_arffcontent(self):
             self.assertIn(arff_line[7], ['won', 'nowin'])
 
     def test__run_model_on_fold(self):
-        task = openml.tasks.get_task(11)
-        num_instances = 3196
+        task = openml.tasks.get_task(7)
+        num_instances = 1054
         num_folds = 1
         num_repeats = 1
 
         clf = SGDClassifier(loss='log', random_state=1)
-        res = openml.runs.functions._run_task_get_arffcontent(clf, task)
-        arff_datacontent, arff_tracecontent, _, fold_evaluations, sample_evaluations = res
+        res = openml.runs.functions._run_model_on_fold(clf, task, 0, 0, 0, True)
+
+        arff_datacontent, arff_tracecontent, user_defined_measures, model = res
         # predictions
         self.assertIsInstance(arff_datacontent, list)
         # trace. SGD does not produce any
-        self.assertIsInstance(arff_tracecontent, type(None))
+        self.assertIsInstance(arff_tracecontent, list)
+        self.assertEquals(len(arff_tracecontent), 0)
+
+        fold_evaluations = collections.defaultdict(lambda: collections.defaultdict(dict))
+        for measure in user_defined_measures:
+            fold_evaluations[measure][0][0] = user_defined_measures[measure]
 
         self._check_fold_evaluations(fold_evaluations, num_repeats, num_folds)
 
@@ -789,7 +789,6 @@ def test__run_model_on_fold(self):
             self.assertIn(arff_line[6], ['won', 'nowin'])
             self.assertIn(arff_line[7], ['won', 'nowin'])
 
-
     def test__create_trace_from_arff(self):
         with open(self.static_cache_dir + '/misc/trace.arff', 'r') as arff_file:
             trace_arff = arff.load(arff_file)