File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
2
from __future__ import unicode_literals
3
3
4
+ import os
4
5
import collections
5
6
import shlex
6
7
@@ -97,7 +98,7 @@ def __getitem__(self, key):
97
98
value = self .settings [key ]
98
99
if key .endswith (("_BINARY" , "_ARGUMENTS" )):
99
100
if isinstance (value , string_types ):
100
- return tuple (shlex .split (value ))
101
+ return tuple (shlex .split (value , posix = ( os . sep == '/' ) ))
101
102
return tuple (value )
102
103
return value
103
104
Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
2
from __future__ import unicode_literals
3
3
4
+ import sys
5
+ from unittest import skipIf , skipUnless
6
+
4
7
from django .test import TestCase
5
8
6
9
from pipeline .conf import PipelineSettings
@@ -23,10 +26,16 @@ def test_expected_splitting(self):
23
26
s = PipelineSettings ({"FOO_BINARY" : "env actualprogram" })
24
27
self .assertEqual (s .FOO_BINARY , ('env' , 'actualprogram' ))
25
28
29
+ @skipIf (sys .platform .startswith ("win" ), "requires posix platform" )
26
30
def test_expected_preservation (self ):
27
31
s = PipelineSettings ({"FOO_BINARY" : r"actual\ program" })
28
32
self .assertEqual (s .FOO_BINARY , ('actual program' ,))
29
33
34
+ @skipUnless (sys .platform .startswith ("win" ), "requires windows" )
35
+ def test_win_path_preservation (self ):
36
+ s = PipelineSettings ({"FOO_BINARY" : "C:\\ Test\\ ActualProgram.exe argument" })
37
+ self .assertEqual (s .FOO_BINARY , ('C:\\ Test\\ ActualProgram.exe' , 'argument' ))
38
+
30
39
def test_tuples_are_normal (self ):
31
40
s = PipelineSettings ({"FOO_ARGUMENTS" : ("explicit" , "with" , "args" )})
32
41
self .assertEqual (s .FOO_ARGUMENTS , ('explicit' , 'with' , 'args' ))
You can’t perform that action at this time.
0 commit comments