christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-08 16:14:08 +00:00
Code Issues Releases Activity

fix: --mount should accept service names with hyphens

Browse Source 
(no changelog entry, as this fixes a feature that hasn't
 yet been released)
This commit is contained in:
Kyle McCormick 2022-04-21 11:43:44 -04:00 committed by Régis Behmo
parent 5a81b6a6cb
commit 126c6062e5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/commands/test_compose.py
View File

@ -26,5 +26,12 @@ class ComposeTests(unittest.TestCase):
], ],
param("lms, cms:/path/to/edx-platform:/openedx/edx-platform"), param("lms, cms:/path/to/edx-platform:/openedx/edx-platform"),
) )
self.assertEqual(
[
("lms", "/path/to/edx-platform", "/openedx/edx-platform"),
("lms-worker", "/path/to/edx-platform", "/openedx/edx-platform"),
],
param("lms,lms-worker:/path/to/edx-platform:/openedx/edx-platform"),
)
with self.assertRaises(ClickException): with self.assertRaises(ClickException):
param("lms,:/path/to/edx-platform:/openedx/edx-platform") param("lms,:/path/to/edx-platform:/openedx/edx-platform")

2
tutor/commands/compose.py
View File

@ -102,7 +102,7 @@ class MountParam(click.ParamType):
MountType = t.Tuple[str, str, str] MountType = t.Tuple[str, str, str]
# Note that this syntax does not allow us to include colon ':' characters in paths # Note that this syntax does not allow us to include colon ':' characters in paths
PARAM_REGEXP = ( PARAM_REGEXP = (
r"(?P<services>[a-zA-Z0-9_, ]+):(?P<host_path>[^:]+):(?P<container_path>[^:]+)" r"(?P<services>[a-zA-Z0-9-_, ]+):(?P<host_path>[^:]+):(?P<container_path>[^:]+)"
) )
def convert( def convert(