jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid duplicate warnings if an unset env variable is used multiple times

Browse source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-08-07 15:04:30 +01:00
commit 4c65891db1
3 changed files with 62 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/unit/config_test.py
View file

@ -198,6 +198,30 @@ class InterpolationTest(unittest.TestCase):
}
])
@mock.patch.dict(os.environ)
def test_unset_variable_produces_warning(self):
os.environ.pop('FOO', None)
os.environ.pop('BAR', None)
config_details = config.ConfigDetails(
config={
'web': {
'image': '${FOO}',
'command': '${BAR}',
'entrypoint': '${BAR}',
},
},
working_dir='.',
filename=None,
)
with mock.patch('compose.config.interpolation.log') as log:
config.load(config_details)
self.assertEqual(2, log.warn.call_count)
warnings = sorted(args[0][0] for args in log.warn.call_args_list)
self.assertIn('BAR', warnings[0])
self.assertIn('FOO', warnings[1])
@mock.patch.dict(os.environ)
def test_invalid_interpolation(self):
with self.assertRaises(config.ConfigurationError) as cm:

31
tests/unit/interpolation_test.py
View file

@ -1,31 +1,32 @@
import unittest
from compose.config.interpolation import interpolate, InvalidInterpolation
from compose.config.interpolation import BlankDefaultDict as bddict
class InterpolationTest(unittest.TestCase):
def test_valid_interpolations(self):
self.assertEqual(interpolate('$foo', dict(foo='hi')), 'hi')
self.assertEqual(interpolate('${foo}', dict(foo='hi')), 'hi')
self.assertEqual(interpolate('$foo', bddict(foo='hi')), 'hi')
self.assertEqual(interpolate('${foo}', bddict(foo='hi')), 'hi')
self.assertEqual(interpolate('${subject} love you', dict(subject='i')), 'i love you')
self.assertEqual(interpolate('i ${verb} you', dict(verb='love')), 'i love you')
self.assertEqual(interpolate('i love ${object}', dict(object='you')), 'i love you')
self.assertEqual(interpolate('${subject} love you', bddict(subject='i')), 'i love you')
self.assertEqual(interpolate('i ${verb} you', bddict(verb='love')), 'i love you')
self.assertEqual(interpolate('i love ${object}', bddict(object='you')), 'i love you')
def test_empty_value(self):
self.assertEqual(interpolate('${foo}', dict(foo='')), '')
self.assertEqual(interpolate('${foo}', bddict(foo='')), '')
def test_unset_value(self):
self.assertEqual(interpolate('${foo}', dict()), '')
self.assertEqual(interpolate('${foo}', bddict()), '')
def test_escaped_interpolation(self):
self.assertEqual(interpolate('$${foo}', dict(foo='hi')), '${foo}')
self.assertEqual(interpolate('$${foo}', bddict(foo='hi')), '${foo}')
def test_invalid_strings(self):
self.assertRaises(InvalidInterpolation, lambda: interpolate('${', dict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('$}', dict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${}', dict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${ }', dict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${ foo}', dict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo }', dict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo!}', dict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${', bddict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('$}', bddict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${}', bddict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${ }', bddict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${ foo}', bddict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo }', bddict()))
self.assertRaises(InvalidInterpolation, lambda: interpolate('${foo!}', bddict()))