FIX minor unittest errors

Author: mfeurer

openml/datasets/functions.py

@@ -106,7 +106,7 @@ def _get_cached_dataset_arff(dataset_id):
         except (OSError, IOError):
             continue
 
-    raise OpenMLCacheException("ARFF file for dataset_id %d not "
+    raise OpenMLCacheException("ARFF file for dataset id %d not "
                                "cached" % dataset_id)
 
 

tests/datasets/test_datasets.py

@@ -52,19 +52,20 @@ def test_get_chached_dataset_description(self):
     def test_get_cached_dataset_description_not_cached(self):
         openml.config.set_cache_directory(self.static_cache_dir)
         self.assertRaisesRegexp(OpenMLCacheException, "Dataset description for "
-                                                      "did 3 not cached",
+                                                      "dataset id 3 not cached",
                                 openml.datasets.functions._get_cached_dataset_description,
                                 3)
 
     def test_get_cached_dataset_arff(self):
         openml.config.set_cache_directory(self.static_cache_dir)
-        description = openml.datasets.functions._get_cached_dataset_arff(did=2)
+        description = openml.datasets.functions._get_cached_dataset_arff(
+            dataset_id=2)
         self.assertIsInstance(description, str)
 
     def test_get_cached_dataset_arff_not_cached(self):
         openml.config.set_cache_directory(self.static_cache_dir)
         self.assertRaisesRegexp(OpenMLCacheException, "ARFF file for "
-                                                      "did 3 not cached",
+                                                      "dataset id 3 not cached",
                                 openml.datasets.functions._get_cached_dataset_arff,
                                 3)
 
@@ -197,12 +198,12 @@ def test_publish_dataset(self):
             name="anneal", version=1, description="test",
             format="ARFF", licence="public", default_target_attribute="class", data_file=file_path)
         dataset.publish()
-        self.assertTrue(isinstance(dataset.dataset_id, int))
+        self.assertIsInstance(dataset.dataset_id, int)
 
     def test_upload_dataset_with_url(self):
         dataset = OpenMLDataset(
             name="UploadTestWithURL", version=1, description="test",
             format="ARFF",
             url="http://expdb.cs.kuleuven.be/expdb/data/uci/nominal/iris.arff")
         dataset.publish()
-        self.assertTrue(isinstance(dataset.dataset_id, int))
+        self.assertIsInstance(dataset.dataset_id, int)

tests/flows/test_flow.py

@@ -21,4 +21,4 @@ def check_flow(flow):
     def test_upload_flow(self):
         flow = openml.OpenMLFlow(model=DummyClassifier(), description="test description")
         flow.publish()
-        self.assertTrue(isinstance(flow.flow_id, int))
+        self.assertIsInstance(flow.flow_id, int)

tests/runs/test_runs.py

@@ -8,8 +8,9 @@ def test_run_iris(self):
         task = openml.tasks.get_task(10107)
         clf = LogisticRegression()
         run = openml.runs.run_task(task, clf)
-        return_code, return_value = run.publish()
-        self.assertTrue(isinstance(run.dataset_id, int))
+        run_ = run.publish()
+        self.assertEqual(run_, run)
+        self.assertIsInstance(run.dataset_id, int)
 
     def test_get_run(self):
         run = openml.runs.get_run(473350)