Quellcode durchsuchen

Always use the Windows version of splitdrive when parsing volume mappings

Signed-off-by: Joffrey F <[email protected]>
Joffrey F vor 9 Jahren
Ursprung
Commit
db0a6cf2bb
2 geänderte Dateien mit 2 neuen und 3 gelöschten Zeilen
  1. 2 1
      compose/config/config.py
  2. 0 2
      tests/unit/config/config_test.py

+ 2 - 1
compose/config/config.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 import functools
 import logging
+import ntpath
 import operator
 import os
 import string
@@ -944,7 +945,7 @@ def split_path_mapping(volume_path):
     if volume_path.startswith('.') or volume_path.startswith('~'):
         drive, volume_config = '', volume_path
     else:
-        drive, volume_config = os.path.splitdrive(volume_path)
+        drive, volume_config = ntpath.splitdrive(volume_path)
 
     if ':' in volume_config:
         (host, container) = volume_config.split(':', 1)

+ 0 - 2
tests/unit/config/config_test.py

@@ -2658,8 +2658,6 @@ class ExpandPathTest(unittest.TestCase):
 
 
 class VolumePathTest(unittest.TestCase):
-
-    @pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
     def test_split_path_mapping_with_windows_path(self):
         host_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config"
         windows_volume_path = host_path + ":/opt/connect/config:ro"