Merge "Use keystoneauth1 instead of keystoneclient.auth"
diff --git a/functional/test_create_update.py b/functional/test_create_update.py
index 8c78951..aa4bdbf 100644
--- a/functional/test_create_update.py
+++ b/functional/test_create_update.py
@@ -150,6 +150,7 @@
properties:
value: Test
fail: {get_param: do_fail}
+ wait_secs: 1
'''
def setUp(self):
diff --git a/functional/test_resources_list.py b/functional/test_resources_list.py
new file mode 100644
index 0000000..257afc5
--- /dev/null
+++ b/functional/test_resources_list.py
@@ -0,0 +1,43 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from heat_integrationtests.functional import functional_base
+
+
+test_template_depend = {
+ 'heat_template_version': '2013-05-23',
+ 'resources': {
+ 'test1': {
+ 'type': 'OS::Heat::TestResource',
+ 'properties': {
+ 'value': 'Test1',
+ }
+ },
+ 'test2': {
+ 'type': 'OS::Heat::TestResource',
+ 'depends_on': ['test1'],
+ 'properties': {
+ 'value': 'Test2',
+ }
+ }
+ }
+}
+
+
+class ResourcesList(functional_base.FunctionalTestsBase):
+
+ def test_filtering_with_depend(self):
+ stack_identifier = self.stack_create(template=test_template_depend)
+ [test2] = self.client.resources.list(stack_identifier,
+ filters={'name': 'test2'})
+
+ self.assertEqual('CREATE_COMPLETE', test2.resource_status)