MAINT remove tests from production code

Author: mfeurer

openml/config.py

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

openml/flows/flow.py

@@ -52,15 +52,10 @@ def _generate_flow_xml(self):
         """
         model = self.model
 
-        if config._testmode:
-            flow_name = '%s%s' % (config.testsentinel, self.name)
-        else:
-            flow_name = self.name
-
         flow_dict = OrderedDict()
         flow_dict['oml:flow'] = OrderedDict()
         flow_dict['oml:flow']['@xmlns:oml'] = 'http://openml.org/openml'
-        flow_dict['oml:flow']['oml:name'] = flow_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
 
@@ -106,7 +101,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:
@@ -118,6 +113,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.
@@ -143,12 +142,6 @@ def _check_flow_exists(name, version):
     if not (type(version) is str and len(version) > 0):
         raise ValueError('Argument \'version\' should be a non-empty string')
 
-    if config._testmode:
-        # It could already be in the name, for example when checking if a
-        # downloaded flow exists on the server
-        if config.testsentinel not in name:
-            name = '%s%s' % (config.testsentinel, name)
-
     return_code, xml_response = _perform_api_call(
         "flow/exists/%s/%s" % (name, version))
     # TODO check with latest version of code if this raises an exception

openml/testing.py

@@ -66,6 +66,4 @@ def tearDown(self):
         os.chdir(self.cwd)
         shutil.rmtree(self.workdir)
 
-        openml.config._testmode = False
-
 __all__ = ['TestBase']

tests/flows/test_flow.py

@@ -1,9 +1,16 @@
+import sys
 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,9 +24,9 @@ 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")
+        name_mock.return_value = '%s%s' % (self.sentinel, flow.name)
         return_code, return_value = flow.publish()
-        # self.assertTrue("This is a read-only account" in return_value)
         self.assertEqual(return_code, 200)