Fix error in staging of config file

grpc4bmi/utils.py

@@ -14,8 +14,8 @@ def stage_config_file(filename, input_dir, input_mount_point, home_mounted=False
         home_mounted (bool): True if home directory is mounted inside container
     """
     fn = filename
-    is_filename_inside_input_dir = input_dir and abspath(input_dir) < abspath(filename)
-    is_filename_inside_home_dir = home_mounted and expanduser('~') < abspath(filename)
+    is_filename_inside_input_dir = input_dir and abspath(filename).startswith(abspath(input_dir))
+    is_filename_inside_home_dir = home_mounted and abspath(filename).startswith(expanduser('~'))
     filename_exists = exists(filename)
     if is_filename_inside_input_dir:
         # Replace input dir outside container by input dir inside container

test/test_utils.py

@@ -0,0 +1,44 @@
+import pytest
+
+from grpc4bmi.utils import stage_config_file
+
+
+class TestStageConfigFile:
+    def test_inside_inputdir(self, tmpdir):
+        input_dir = tmpdir.mkdir('input')
+        c = input_dir.join('config.cfg')
+        c.write("something")
+
+        result = stage_config_file(c, input_dir, input_mount_point='/data/input')
+        assert result == '/data/input/config.cfg'
+
+    def test_outside_inputdir(self, tmpdir):
+        input_dir = tmpdir.mkdir('input')
+        c = tmpdir.join('config.cfg')
+        c.write("something")
+
+        result = stage_config_file(c, input_dir, input_mount_point='/data/input')
+        assert result == '/data/input/config.cfg'
+
+    def test_outside_inputdir_beforeconfig(self, tmpdir):
+        input_dir = tmpdir.mkdir('ainput')
+        c = tmpdir.join('config.cfg')
+        c.write("something")
+
+        result = stage_config_file(c, input_dir, input_mount_point='/data/input')
+        assert result == '/data/input/config.cfg'
+
+    def test_cfg_in_container(self, tmpdir):
+        input_dir = tmpdir.mkdir('input')
+
+        c = '/somewhere/config.cfg'
+        result = stage_config_file(c, input_dir, input_mount_point='/data/input')
+        assert result == c
+
+    def test_noinputdir(self, tmpdir):
+        c = tmpdir.join('config.cfg')
+        c.write("something")
+
+        with pytest.raises(Exception) as exc_info:
+            stage_config_file(c, None, None)
+        assert str(exc_info.value).startswith('Unable to copy')