Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable launch_stack tests #1844

Merged
merged 2 commits into from
Feb 15, 2016
Merged

Enable launch_stack tests #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ec9f55
enabling launch_stack test
Feb 11, 2016
3c8b11c
set imageRef for launch_server only
Feb 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion otter/integration/lib/autoscale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,8 @@ def record_results(resp):
return rcs

def send(image_id):
if image_id is not None:
lc_type = self.group_config["launchConfiguration"]["type"]
if image_id is not None and lc_type == "launch_server":
self.group_config = update_in(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has a hacky feel to it, but okay. At least it works!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. Unfortunately the whole getting image id in trial tests is hacky :(

self.group_config,
["launchConfiguration", "args", "server", "imageRef"],
Expand Down
3 changes: 2 additions & 1 deletion otter/integration/lib/trial_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ def get_resource_mapping():
Get resource mapping based on the environment settings
"""
res = {'nova': (nova_key,),
'loadbalancers': (clb_key,)}
'loadbalancers': (clb_key,),
'heat': (heat_key,)}
if otter_local_url is not None:
res['otter'] = ("badkey", otter_local_url)
else:
Expand Down
4 changes: 1 addition & 3 deletions otter/integration/tests/test_launch_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
TestHelper,
get_identity,
get_resource_mapping,
region,
skip_me)
region)

from otter.util.deferredutils import retry_and_timeout
from otter.util.http import check_success, headers
Expand Down Expand Up @@ -112,7 +111,6 @@ def poll():
"Waiting for group {} to reach state {}".format(
self.group.group_id, str(expected_states))))

@skip_me('Due to https://github.com/rackerlabs/mimic/issues/513')
@inlineCallbacks
def test_create(self):
"""
Expand Down