Add file storage tests.

Author: guzman-raphael

datajoint/external.py

@@ -78,9 +78,10 @@ def _make_external_filepath(self, relative_filepath):
         if self.spec['protocol'] == 's3':
             posix_path = PurePosixPath(PureWindowsPath(self.spec['location']))
             location_path = Path(
-                    *posix_path.parts[1:]) if any(
-                        case in posix_path.parts[0] for case in (
-                            '\\', ':')) else Path(posix_path)
+                    *posix_path.parts[1:]) if len(
+                    self.spec['location']) > 0 and any(
+                    case in posix_path.parts[0] for case in (
+                        '\\', ':')) else Path(posix_path)
             return PurePosixPath(location_path, relative_filepath)
         # Preserve root
         elif self.spec['protocol'] == 'file':

tests/test_external.py

@@ -8,15 +8,17 @@
 import datajoint as dj
 from .schema_external import stores_config
 from .schema_external import SimpleRemote
-current_location = dj.config['stores']['share']['location']
+current_location_s3 = dj.config['stores']['share']['location']
+current_location_local = dj.config['stores']['local']['location']
 
 
 def setUp(self):
     dj.config['stores'] = stores_config
 
 
 def tearDown(self):
-    dj.config['stores']['share']['location'] = current_location
+    dj.config['stores']['share']['location'] = current_location_s3
+    dj.config['stores']['local']['location'] = current_location_local
 
 
 def test_external_put():
@@ -41,38 +43,63 @@ def test_external_put():
     assert_array_equal(input_, output_)
 
 
-def test_leading_slash():
+def test_s3_leading_slash(index=100, store='share'):
     """
-    external storage configured with leading slash
+    s3 external storage configured with leading slash
     """
     value = np.array([1, 2, 3])
 
-    id = 100
-    dj.config['stores']['share']['location'] = 'leading/slash/test'
+    id = index
+    dj.config['stores'][store]['location'] = 'leading/slash/test'
     SimpleRemote.insert([{'simple': id, 'item': value}])
     assert_true(np.array_equal(
         value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
 
-    id = 101
-    dj.config['stores']['share']['location'] = '/leading/slash/test'
+    id = index + 1
+    dj.config['stores'][store]['location'] = '/leading/slash/test'
     SimpleRemote.insert([{'simple': id, 'item': value}])
     assert_true(np.array_equal(
         value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
 
-    id = 102
-    dj.config['stores']['share']['location'] = 'leading\\slash\\test'
+    id = index + 2
+    dj.config['stores'][store]['location'] = 'leading\\slash\\test'
     SimpleRemote.insert([{'simple': id, 'item': value}])
     assert_true(np.array_equal(
         value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
 
-    id = 103
-    dj.config['stores']['share']['location'] = 'f:\\leading\\slash\\test'
+    id = index + 3
+    dj.config['stores'][store]['location'] = 'f:\\leading\\slash\\test'
     SimpleRemote.insert([{'simple': id, 'item': value}])
     assert_true(np.array_equal(
         value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
 
-    id = 104
-    dj.config['stores']['share']['location'] = 'f:\\leading/slash\\test'
+    id = index + 4
+    dj.config['stores'][store]['location'] = 'f:\\leading/slash\\test'
     SimpleRemote.insert([{'simple': id, 'item': value}])
     assert_true(np.array_equal(
         value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
+
+    id = index + 5
+    dj.config['stores'][store]['location'] = '/'
+    SimpleRemote.insert([{'simple': id, 'item': value}])
+    assert_true(np.array_equal(
+        value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
+
+    id = index + 6
+    dj.config['stores'][store]['location'] = 'C:\\'
+    SimpleRemote.insert([{'simple': id, 'item': value}])
+    assert_true(np.array_equal(
+        value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
+
+    id = index + 7
+    dj.config['stores'][store]['location'] = ''
+    SimpleRemote.insert([{'simple': id, 'item': value}])
+    assert_true(np.array_equal(
+        value, (SimpleRemote & 'simple={}'.format(id)).fetch1('item')))
+
+
+def test_file_leading_slash():
+    """
+    file external storage configured with leading slash
+    """
+    test_s3_leading_slash(index=200, store='local')