From 95e4b7c5488bb5a4f4057db33a0096ba3d21cbc1 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Tue, 27 May 2014 17:44:39 -0400 Subject: [PATCH] Unit tests: remove resolve_runtime_data() call This was accidentally reintroduced after a merge conflict. Change-Id: Ibae58aae1520d8f934b59eb9dae6979d95a0a312 --- contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py index 21527d854..8ec1513dc 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py @@ -111,7 +111,6 @@ class CloudServersTest(HeatTestCase): server = cloud_server.CloudServer(server_name, t['Resources']['WebServer'], stack) - server.t = server.stack.resolve_runtime_data(server.t) self._stub_server_validate(server, image_id or 'CentOS 5.2', 1) if stub_create: self.m.StubOutWithMock(self.fc.servers, 'create')