resolve conflict with staging

2020-02-06 10:19:47 -05:00
parent 6420cce4fc 406c2af811
commit 7559875d64
21 changed files with 333 additions and 392 deletions
--- a/tests/domain/test_portfolio_state_machine.py
+++ b/tests/domain/test_portfolio_state_machine.py
@@ -133,8 +133,8 @@ def test_fsm_transition_start(mock_cloud_provider, portfolio: Portfolio):
        "user_id": user_id,
        "password": "jklfsdNCVD83nklds2#202",  # pragma: allowlist secret
        "domain_name": domain_name,
-        "display_name" : "mgmt group display name",
-        "management_group_name" : "mgmt-group-uuid",
+        "display_name": "mgmt group display name",
+        "management_group_name": "mgmt-group-uuid",
        "first_name": ppoc.first_name,
        "last_name": ppoc.last_name,
        "country_code": "US",