commit f63ed65d95cd294aa66b115dcbd6d305d561db24
author Jenkins <jenkins@review.openstack.org> Sat Dec 21 20:47:25 2013 +0000
committer Gerrit Code Review <review@openstack.org> Sat Dec 21 20:47:25 2013 +0000
tree 580dfdb64fc3c199652faa79df8ac60c5703e5f9
parent 55a0b12c304bcaef6b5c1a2284b4b377b9d79494
parent 09925972ad6099c36aa5ee9cc9af60af6dbcb718

Merge "Fix AttributeError on BadRequest in scenario tests"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 207c542..2f28068 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -261,7 +261,8 @@
             except Exception as e:
                 # If the resource is already missing, mission accomplished.
                 # add status code as workaround for bug 1247568
-                if e.__class__.__name__ == 'NotFound' or e.status_code == 404:
+                if (e.__class__.__name__ == 'NotFound' or
+                    hasattr(e, 'status_code') and e.status_code == 404):
                     continue
                 raise