commit 8c9aee1dbe1ef045f1999a1a854e147f8a4e437c
author Steve Baker <sbaker@redhat.com> Tue Mar 10 16:17:45 2015 +1300
committer Steve Baker <sbaker@redhat.com> Thu Mar 12 08:57:38 2015 +1300
tree 64d949da585a4c51f79fbc3eb9ee4ea671d2135d
parent 856f5755c10ef7693ef21e992021bc223d74e9a6

Fixes for test_server_software_config

- Fixes building of self.stack_identifier
- Only check updated_time if the attribute exists.
  This allows latest heat agent code to be tested with
  Juno heat (which doesn't expose updated_time)

Change-Id: I3baa03a7305b95960e0d160a0c666e2a60aa0fa6

scenario/test_server_software_config.py

diff --git a/scenario/test_server_software_config.py b/scenario/test_server_software_config.py
index a70c32f..86672c5 100644
--- a/scenario/test_server_software_config.py
+++ b/scenario/test_server_software_config.py
@@ -48,7 +48,8 @@
                           'skipping')
         self.stack_name = self._stack_rand_name()
 
-    def check_stack(self, sid):
+    def check_stack(self):
+        sid = self.stack_identifier
         # Check that all stack resources were created
         for res in ('cfg2a', 'cfg2b', 'cfg1', 'cfg3', 'server'):
             self._wait_for_resource_status(
@@ -123,8 +124,14 @@
         dep1_resource = self.client.resources.get(sid, 'dep1')
         dep1_id = dep1_resource.physical_resource_id
         dep1_dep = self.client.software_deployments.get(dep1_id)
-        self.assertIsNotNone(dep1_dep.updated_time)
-        self.assertNotEqual(dep1_dep.updated_time, dep1_dep.creation_time)
+        if hasattr(dep1_dep, 'updated_time'):
+            # Only check updated_time if the attribute exists.
+            # This allows latest heat agent code to be tested with
+            # Juno heat (which doesn't expose updated_time)
+            self.assertIsNotNone(dep1_dep.updated_time)
+            self.assertNotEqual(
+                dep1_dep.updated_time,
+                dep1_dep.creation_time)
 
     def test_server_software_config(self):
         """
@@ -151,7 +158,7 @@
         }
 
         # Launch stack
-        stack_id = self.launch_stack(
+        self.stack_identifier = self.launch_stack(
             stack_name=self.stack_name,
             template_name='test_server_software_config.yaml',
             parameters=parameters,
@@ -159,7 +166,5 @@
             expected_status=None
         )
 
-        self.stack_identifier = '%s/%s' % (self.stack_name, stack_id)
-
         # Check stack
-        self.check_stack(self.stack_identifier)
+        self.check_stack()