ansible · pilou- · Feb 8, 2018 · Feb 8, 2018 · Feb 8, 2018 · Feb 8, 2018
diff --git a/container/config.py b/container/config.py
@@ -6,13 +6,12 @@
 logger = getLogger(__name__)
 
 from abc import ABCMeta, abstractproperty, abstractmethod
-from io import BytesIO
 import os
 from os import path
 import copy
 import json
 import re
-from six import add_metaclass, iteritems, PY2, string_types, text_type
+from six import add_metaclass, iteritems, PY2, string_types, text_type, StringIO
 
 from collections import Mapping
 from .utils.ordereddict import ordereddict
@@ -371,10 +370,10 @@ def _process_section(self, section_value, callback=None, templar=None):
             elif isinstance(value, (list, dict)):
                 # if it's a dimensional structure, it's cheaper just to serialize
                 # it, treat it like a template, and then deserialize it again
-                buffer = BytesIO() # use bytes explicitly, not unicode
-                yaml.round_trip_dump(value, buffer)
+                stream = StringIO()
+                yaml.round_trip_dump(value, stream)
                 processed[key] = yaml.round_trip_load(
-                    templar.template(buffer.getvalue())
+                    templar.template(stream.getvalue())
                 )
             else:
                 # ints, booleans, etc.

diff --git a/container/utils/__init__.py b/container/utils/__init__.py
@@ -252,6 +252,16 @@ def generate_playbook_for_role(service_name, vars, role):
     logger.debug('Playbook generated: %s', playbook)
     return playbook
 
+
+def get_dependencies_for_role(role_path):
+    meta_main_path = os.path.join(role_path, 'meta', 'main.yml')
+    if os.path.exists(meta_main_path):
+        meta_main = yaml.safe_load(open(meta_main_path))
+        if meta_main:
+            for dependency in meta_main.get('dependencies', []):
+                yield dependency.get('role', None)
+
+
 @container.conductor_only
 def get_role_fingerprint(role, service_name, config_vars):
     """
@@ -307,14 +317,6 @@ def hash_role(hash_obj, role_path):
                     else:
                         hash_dir(hash_obj, src)
 
-    def get_dependencies_for_role(role_path):
-        meta_main_path = os.path.join(role_path, 'meta', 'main.yml')
-        if os.path.exists(meta_main_path):
-            meta_main = yaml.safe_load(open(meta_main_path))
-            if meta_main:
10000
-                for dependency in meta_main.get('dependencies', []):
-                    yield dependency.get('role', None)
-
     hash_obj = hashlib.sha256()
     # Account for variables passed to the role by including the invocation string
     hash_obj.update((json.dumps(role) if not isinstance(role, string_types) else role) + '::')

diff --git a/test/roles/validate-config/files/container.yml b/test/roles/validate-config/files/container.yml
@@ -1,4 +1,7 @@
 version: '2'
+settings:
+  conductor:
+    base: "centos:7"
 defaults:
   web_image: "centos:7" 
   web_ports: ['8080:80']

diff --git a/test/roles/validate-config/tasks/main.yml b/test/roles/validate-config/tasks/main.yml
@@ -51,12 +51,13 @@
 
 - include: includes/show-output.yml output_file=./task.output registered_output="{{ output }}"    
 
+# Expected output:
+# Playbook generated: [{'hosts': u'web', 'roles': [ordereddict([('role', 'test-variables')])], 'vars': {u'debug': 0, u'web_image': u'centos:7', u'foo': u'bar', u'project_path': u'/foo', u'web_ports': [u'8080:80']}}] [container.utils]
 - name: Test build output for container.yml defaults
   assert:
     that:
-      - "'web_image=centos:7' in build_output.stdout" 
+      - "build_output.stdout is search(\"'web_image': u'centos:7'\")"
       - "'8080:80' in build_output.stdout"
-      - "'debug=0' in build_output.stdout" 
-      - "'foo=bar' in build_output.stdout" 
-      - "'project_path=/foo' in build_output.stdout" 
-
+      - "build_output.stdout is search(\"'debug': 0\")"
+      - "build_output.stdout is search(\"'foo': u'bar'\")"
+      - "build_output.stdout is search(\"'project_path': u'/foo'\")"
diff --git a/test/run_tests.yml b/test/run_tests.yml
@@ -117,4 +117,8 @@
       include_role:
         name: validate-rebuild-features
       tags: rebuild
+    - name: "Validate config"
+      include_role:
+        name: validate-config
+      tags: config
 
diff --git a/test/tests/validate_config.py b/test/tests/validate_config.py
@@ -3,9 +3,11 @@
 import json
 
 import container
-from container.utils import get_config
 from container.config import AnsibleContainerConductorConfig
 from container.exceptions import AnsibleContainerConfigException
+from container.utils import get_dependencies_for_role, get_config
+from ansible.compat.tests.mock import mock_open, patch
+from ansible.module_utils.six.moves import builtins
 from ansible.playbook.role.include import RoleInclude
 
 try:
@@ -31,7 +33,7 @@ def setUp(self):
         container.ENV = 'host'
         container.config.Templar = Templar
         container.config.AnsibleUnsafeText = AnsibleUnsafeText
-        self.config = get_config(self.project_path, vars_files=None, engine_name='docker')
+        self.config = get_config(self.project_path, vars_files=None, engine_name='docker', config_file='container.yml')
 
     def tearDown(self):
         pass
@@ -50,7 +52,7 @@ def test_should_have_project_name_equal_basename(self):
         self.assertEqual(self.config.project_name, os.path.basename(self.project_path))
 
     def test_should_have_project_name_equal_cli(self):
-        config = get_config(self.project_path, vars_files=None, engine_name='docker', project_name='foo')
+        config = get_config(self.project_path, vars_files=None, engine_name='docker', project_name='foo', config_file='container.yml')
         self.assertEqual(config.project_name, 'foo')
 
     def test_should_have_project_name_equal_settings(self):
@@ -171,3 +173,8 @@ def test_should_use_dev_overrides(self):
     #     self.assertEqual(self.config._config['services']['web']['environment'][2], 'VERSION={0}'.format(__version__))
 
 
+    @patch('os.path.exists', lambda x: True)
+    def test_get_dependencies_for_role(self):
+        with patch.object(builtins, 'open', mock_open(read_data=b'---\n')):
+            for x in get_dependencies_for_role('dummy'):
+                pass