Fix composition start up

There are a couple of bugs when starting up a docker composition. These are small fixes that get us past those errors. Change-Id: I01ddf92ce27e3c2d232d89d39e94b573de59e1c3 Signed-off-by: Latitia M Haskins <[email protected]>
hyperledger · Feb 24, 2017 · 7296d14 · 7296d14
1 parent ab7e1da
commit 7296d14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/bddtests/steps/compose.py b/bddtests/steps/compose.py
@@ -74,6 +74,8 @@ def __init__(self, context, composeFilesYaml, projectName = None,
         self.containerDataList = []
         self.composeFilesYaml = composeFilesYaml
 
+        self.serviceNames = []
+        self.serviceNames = self._collectServiceNames()
         [callback.composing(self, context) for callback in Composition.GetCompositionCallbacksFromContext(context)]
         self.up(context, force_recreate, components)
 

diff --git a/bddtests/steps/contexthelper.py b/bddtests/steps/contexthelper.py
@@ -44,7 +44,8 @@ def getTmpProjectPath(self):
 
     def getTmpPathForName(self, name, extension=None, copyFromCache=False):
         'Returns the tmp path for a file, and a flag indicating if the file exists. Will also check in the cache and copy to tmp if copyFromCache==True'
-        slugifiedName = ".".join([slugify(name), extension]) if extension else slugify(name)
+        unicodeName = unicode(name)
+        slugifiedName = ".".join([slugify(unicodeName), extension]) if extension else slugify(unicodeName)
         tmpPath = os.path.join(self.getTmpProjectPath(), slugifiedName)
         fileExists = False
         if os.path.isfile(tmpPath):