Merge 80d6e43 into cb5f232

zalando-stups · Aug 20, 2018 · 665acc8 · 665acc8
2 parents cb5f232 + 80d6e43
commit 665acc8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/senza/spotinst/components/elastigroup.py → senza/components/elastigroup.py b/senza/spotinst/components/elastigroup.py → senza/components/elastigroup.py
diff --git a/tests/test_elastigroup.py b/tests/test_elastigroup.py
@@ -4,11 +4,11 @@
 from mock import MagicMock
 
 from senza.spotinst import MissingSpotinstAccount
-from senza.spotinst.components.elastigroup import (component_elastigroup, ELASTIGROUP_DEFAULT_PRODUCT,
-    ELASTIGROUP_DEFAULT_STRATEGY, resolve_account_id, SPOTINST_API_URL, extract_block_mappings,
-    extract_auto_scaling_rules, ensure_instance_monitoring, ensure_default_strategy, extract_autoscaling_capacity,
-    ensure_default_product, fill_standard_tags, extract_subnets, extract_load_balancer_name, extract_public_ips,
-    extract_image_id, extract_security_group_ids, extract_instance_types, extract_instance_profile)
+from senza.components.elastigroup import (component_elastigroup, ELASTIGROUP_DEFAULT_PRODUCT,
+                                          ELASTIGROUP_DEFAULT_STRATEGY, resolve_account_id, SPOTINST_API_URL, extract_block_mappings,
+                                          extract_auto_scaling_rules, ensure_instance_monitoring, ensure_default_strategy, extract_autoscaling_capacity,
+                                          ensure_default_product, fill_standard_tags, extract_subnets, extract_load_balancer_name, extract_public_ips,
+                                          extract_image_id, extract_security_group_ids, extract_instance_types, extract_instance_profile)
 
 
 def test_component_elastigroup_defaults(monkeypatch):
@@ -36,7 +36,7 @@ def test_component_elastigroup_defaults(monkeypatch):
 
     mock_resolve_account_id = MagicMock()
     mock_resolve_account_id.return_value = 'act-12345abcdef'
-    monkeypatch.setattr('senza.spotinst.components.elastigroup.resolve_account_id', mock_resolve_account_id)
+    monkeypatch.setattr('senza.components.elastigroup.resolve_account_id', mock_resolve_account_id)
 
     mock_account_info = MagicMock()
     mock_account_info.Region = "reg1"