docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix dockerignore exclusion logic on Windows 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-10-13 16:45:01 -07:00
parent cec3fe7c31
commit 9b35c74f0e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/utils/utils.py
View File

@ -209,8 +209,8 @@ def match_path(path, pattern):
if pattern: if pattern:
pattern = os.path.relpath(pattern) pattern = os.path.relpath(pattern)
pattern_components = pattern.split('/') pattern_components = pattern.split(os.path.sep)
path_components = path.split('/')[:len(pattern_components)] path_components = path.split(os.path.sep)[:len(pattern_components)]
return fnmatch('/'.join(path_components), pattern) return fnmatch('/'.join(path_components), pattern)

6
tests/integration/container_test.py
View File

@ -414,6 +414,9 @@ class VolumeBindTest(BaseIntegrationTest):
['touch', os.path.join(self.mount_dest, self.filename)], ['touch', os.path.join(self.mount_dest, self.filename)],
) )
@pytest.mark.xfail(
IS_WINDOWS_PLATFORM, reason='Test not designed for Windows platform'
)
def test_create_with_binds_rw(self): def test_create_with_binds_rw(self):
container = self.run_with_volume( container = self.run_with_volume(
@ -429,6 +432,9 @@ class VolumeBindTest(BaseIntegrationTest):
inspect_data = self.client.inspect_container(container) inspect_data = self.client.inspect_container(container)
self.check_container_data(inspect_data, True) self.check_container_data(inspect_data, True)
@pytest.mark.xfail(
IS_WINDOWS_PLATFORM, reason='Test not designed for Windows platform'
)
def test_create_with_binds_ro(self): def test_create_with_binds_ro(self):
self.run_with_volume( self.run_with_volume(
False, False,