Merge pull request #158 from openml/fix/add_sentinels

Fix/add sentinels

Author: mfeurer

openml/config.py

@@ -16,6 +16,7 @@
 cachedir = ""
 privatedir = ""
 
+
 if sys.version_info[0] < 3:
     import ConfigParser as configparser
     from StringIO import StringIO

openml/flows/flow.py

@@ -50,10 +50,11 @@ def _generate_flow_xml(self):
             Flow represented as XML string.
         """
         model = self.model
+
         flow_dict = OrderedDict()
         flow_dict['oml:flow'] = OrderedDict()
         flow_dict['oml:flow']['@xmlns:oml'] = 'http://openml.org/openml'
-        flow_dict['oml:flow']['oml:name'] = self.name
+        flow_dict['oml:flow']['oml:name'] = self._get_name()
         flow_dict['oml:flow']['oml:external_version'] = self.external_version
         flow_dict['oml:flow']['oml:description'] = self.description
 
@@ -103,7 +104,7 @@ def _ensure_flow_exists(self):
         """
         import sklearn
         flow_version = 'sklearn_' + sklearn.__version__
-        _, _, flow_id = _check_flow_exists(self.name, flow_version)
+        _, _, flow_id = _check_flow_exists(self._get_name(), flow_version)
         # TODO add numpy and scipy version!
 
         if int(flow_id) == -1:
@@ -115,6 +116,10 @@ def _ensure_flow_exists(self):
 
         return int(flow_id)
 
+    def _get_name(self):
+        """Helper function. Can be mocked for testing."""
+        return self.name
+
 
 def _check_flow_exists(name, version):
     """Retrieves the flow id of the flow uniquely identified by name+version.

tests/flows/test_flow.py

@@ -1,9 +1,18 @@
+import hashlib
+import sys
+import time
 import unittest
+
 from sklearn.dummy import DummyClassifier
 
 from openml.testing import TestBase
 import openml
 
+if sys.version_info[0] >= 3:
+    from unittest import mock
+else:
+    import mock
+
 
 class TestFlow(TestBase):
     @unittest.skip('The method which is tested by this function doesnt exist')
@@ -17,8 +26,17 @@ def check_flow(flow):
         for flow in flows:
             check_flow(flow)
 
-    @unittest.skip('Not tested until test sentinels are added back.')
-    def test_upload_flow(self):
+    @mock.patch.object(openml.OpenMLFlow, '_get_name', autospec=True)
+    def test_upload_flow(self, name_mock):
         flow = openml.OpenMLFlow(model=DummyClassifier(), description="test description")
+
+        # Create a unique prefix for the flow. Necessary because the flow is
+        # identified by its name and external version online. Having a unique
+        #  name allows us to publish the same flow in each test run
+        md5 = hashlib.md5()
+        md5.update(str(time.time()).encode('utf-8'))
+        sentinel = md5.hexdigest()[:10]
+        name_mock.return_value = '%s%s' % (sentinel, flow.name)
+
         flow.publish()
         self.assertIsInstance(flow.flow_id, int)