openstack/magnum
Code Issues Proposed changes

Merge "Fix copying logs from nodes"

Browse Source
This commit is contained in:
Jenkins 2016-08-05 18:55:16 +00:00 committed by Gerrit Code Review
commit 35bec1887c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/tests/functional/common/base.py
View File

@ -58,6 +58,9 @@ class BaseMagnumTest(base.BaseTestCase):
full_location = os.path.join(base_path, COPY_LOG_HELPER)
def do_copy_logs(prefix, nodes_address):
if not nodes_address:
return
cls.LOG.info("copy logs from : %s" %
','.join(nodes_address))
log_name = prefix + "-" + func_name

5
magnum/tests/functional/python_client_base.py
View File

@ -274,9 +274,12 @@ extendedKeyUsage = clientAuth
def _get_nodes(self):
nodes = self._get_nodes_from_bay()
if not nodes:
if not [x for x in nodes if x]:
self.LOG.info("the list of nodes from bay is empty")
nodes = self._get_nodes_from_stack()
if not [x for x in nodes if x]:
self.LOG.info("the list of nodes from stack is empty")
self.LOG.info("Nodes are: %s" % nodes)
return nodes
def _get_nodes_from_bay(self):