Remove some legacy code including legacy exceptions and associated tests

DiamondLightSource · Dec 4, 2017 · 1a0dd54 · 1a0dd54
1 parent 8d4fe73
commit 1a0dd54
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 140 deletions.
diff --git a/ispyb/__init__.py b/ispyb/__init__.py
@@ -34,6 +34,9 @@ def open(configuration_file):
   return conn
 
 # add legacy imports to top level name space
-import ispyb.legacy.common.driver
-legacy_get_driver = ispyb.legacy.common.driver.get_driver
-legacy_Backend = ispyb.legacy.common.driver.Backend
+from enum import Enum
+def legacy_get_driver(_):
+  import ispyb.legacy.driver.mysql.main
+  return ispyb.legacy.driver.mysql.main.ISPyBMySQLDriver
+class legacy_Backend(Enum):
+  DATABASE_MYSQL = 1
diff --git a/ispyb/legacy/common/__init__.py b/ispyb/legacy/common/__init__.py
diff --git a/ispyb/legacy/common/driver.py b/ispyb/legacy/common/driver.py
diff --git a/ispyb/legacy/driver/api.py b/ispyb/legacy/driver/api.py
diff --git a/ispyb/legacy/driver/dummy.py b/ispyb/legacy/driver/dummy.py
diff --git a/ispyb/legacy/exception.py b/ispyb/legacy/exception.py
diff --git a/ispyb/legacy/release.sh b/ispyb/legacy/release.sh
diff --git a/ispyb/legacy/setup.py b/ispyb/legacy/setup.py
diff --git a/ispyb/legacy/test/common/test_driver.py b/ispyb/legacy/test/common/test_driver.py
diff --git a/ispyb/legacy/test/driver/test_common.py b/ispyb/legacy/test/driver/test_common.py
@@ -2,8 +2,6 @@
 
 import inspect
 
-import ispyb.legacy.driver.api
-import ispyb.legacy.driver.dummy
 import ispyb.legacy.driver.mysql.main
 import ispyb.legacy.interface.main
 import pytest
@@ -24,11 +22,5 @@ def check_interface(self, implementation):
              "Implementation of function %s in database driver does not " \
              "match function signature in interface definition" % fn
 
-  def test_that_the_API_driver_implementation_matches_the_interface_function_signatures(self):
-    self.check_interface(ispyb.legacy.driver.api.ISPyBAPIDriver)
-
   def test_that_the_database_driver_implementation_matches_the_interface_function_signatures(self):
     self.check_interface(ispyb.legacy.driver.mysql.main.ISPyBMySQLDriver)
-
-  def test_that_the_dummy_driver_implementation_matches_the_interface_function_signatures(self):
-    self.check_interface(ispyb.legacy.driver.dummy.ISPyBDummyDriver)