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

Revert "Add 'labels:' config option"

Browse source 
This reverts commit 721327110d.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-23 14:41:43 -07:00
commit 965426e39b
6 changed files with 3 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tests/integration/service_test.py
View file

@ -491,30 +491,3 @@ class ServiceTest(DockerClientTestCase):
env = create_and_start_container(service).environment
for k,v in {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}.items():
self.assertEqual(env[k], v)
def test_labels(self):
labels_dict = {
'com.example.description': "Accounting webapp",
'com.example.department': "Finance",
'com.example.label-with-empty-value': "",
}
service = self.create_service('web', labels=labels_dict)
labels = create_and_start_container(service).get('Config.Labels').items()
for pair in labels_dict.items():
self.assertIn(pair, labels)
labels_list = ["%s=%s" % pair for pair in labels_dict.items()]
service = self.create_service('web', labels=labels_list)
labels = create_and_start_container(service).get('Config.Labels').items()
for pair in labels_dict.items():
self.assertIn(pair, labels)
def test_empty_labels(self):
labels_list = ['foo', 'bar']
service = self.create_service('web', labels=labels_list)
labels = create_and_start_container(service).get('Config.Labels').items()
for name in labels_list:
self.assertIn((name, ''), labels)