Fix formatting and some typos

tests/domain/test_portfolio_state_machine.py

@@ -13,26 +13,24 @@ def portfolio():
     portfolio = PortfolioFactory.create()
     return portfolio
 
+
 def test_fsm_creation(portfolio):
     sm = PortfolioStateMachineFactory.create(portfolio=portfolio)
     assert sm.portfolio
 
+
 def test_fsm_transition_start(portfolio):
     sm = PortfolioStateMachineFactory.create(portfolio=portfolio)
     assert sm.portfolio
     assert sm.state == FSMStates.UNSTARTED
 
     # next_state does not create the trigger callbacks !!!
-    #sm.next_state()
+    # sm.next_state()
 
     sm.init()
     assert sm.state == FSMStates.STARTING
 
     sm.start()
     assert sm.state == FSMStates.STARTED
-    #import ipdb;ipdb.set_trace()
     sm.create_tenant(a=1, b=2)
     assert sm.state == FSMStates.TENANT_CREATED
-
-
-

tests/domain/test_portfolios.py

@@ -6,6 +6,7 @@ from atst.domain.portfolios import (
     Portfolios,
     PortfolioError,
     PortfolioDeletionApplicationsExistError,
+    PortfolioStateMachines,
 )
 from atst.domain.portfolio_roles import PortfolioRoles
 from atst.domain.applications import Applications
@@ -256,16 +257,16 @@ def test_for_user_does_not_include_deleted_application_roles():
     )
     assert len(Portfolios.for_user(user2)) == 0
 
+
 def test_create_state_machine(portfolio):
-    fsm = Portfolios.create_state_machine(portfolio)
+    fsm = PortfolioStateMachines.create(portfolio)
     assert fsm
 
+
 def test_get_portfolios_pending_provisioning(session):
     for x in range(5):
         portfolio = PortfolioFactory.create()
         sm = PortfolioStateMachineFactory.create(portfolio=portfolio)
-        if x == 2: sm.state = FSMStates.COMPLETED
+        if x == 2:
+            sm.state = FSMStates.COMPLETED
     assert len(Portfolios.get_portfolios_pending_provisioning()) == 4
-
-
-

tests/factories.py

@@ -343,6 +343,7 @@ class NotificationRecipientFactory(Base):
 
     email = factory.Faker("email")
 
+
 class PortfolioStateMachineFactory(Base):
     class Meta:
         model = PortfolioStateMachine
@@ -352,6 +353,6 @@ class PortfolioStateMachineFactory(Base):
     @classmethod
     def _create(cls, model_class, *args, **kwargs):
         portfolio = kwargs.pop("portfolio", PortfolioFactory.create())
-        kwargs.update({'portfolio': portfolio})
+        kwargs.update({"portfolio": portfolio})
         fsm = super()._create(model_class, *args, **kwargs)
         return fsm

tests/test_jobs.py

@@ -17,6 +17,8 @@ from atst.jobs import (
     create_environment,
     do_provision_user,
     do_provision_portfolio,
+    do_create_environment,
+    do_create_atat_admin_user,
 )
 from atst.models.utils import claim_for_update
 from atst.domain.exceptions import ClaimFailedException
@@ -34,6 +36,7 @@ from atst.models import CSPRole, EnvironmentRole, ApplicationRoleStatus
 def csp():
     return Mock(wraps=MockCloudProvider({}, with_delay=False, with_failure=False))
 
+
 @pytest.fixture(scope="function")
 def portfolio():
     portfolio = PortfolioFactory.create()
@@ -316,21 +319,28 @@ def test_do_provision_user(csp, session):
     # I expect that the EnvironmentRole now has a csp_user_id
     assert environment_role.csp_user_id
 
-def test_dispatch_provision_portfolio(csp, session, portfolio, celery_app, celery_worker, monkeypatch):
+
+def test_dispatch_provision_portfolio(
+    csp, session, portfolio, celery_app, celery_worker, monkeypatch
+):
     sm = PortfolioStateMachineFactory.create(portfolio=portfolio)
     mock = Mock()
     monkeypatch.setattr("atst.jobs.provision_portfolio", mock)
     dispatch_provision_portfolio.run()
     mock.delay.assert_called_once_with(portfolio_id=portfolio.id)
 
+
 def test_do_provision_portfolio(csp, session, portfolio):
     do_provision_portfolio(csp=csp, portfolio_id=portfolio.id)
     session.refresh(portfolio)
     assert portfolio.state_machine
 
-def test_provision_portfolio_create_tenant(csp, session, portfolio, celery_app, celery_worker, monkeypatch):
+
+def test_provision_portfolio_create_tenant(
+    csp, session, portfolio, celery_app, celery_worker, monkeypatch
+):
     sm = PortfolioStateMachineFactory.create(portfolio=portfolio)
-    #mock = Mock()
-    #monkeypatch.setattr("atst.jobs.provision_portfolio", mock)
-    #dispatch_provision_portfolio.run()
-    #mock.delay.assert_called_once_with(portfolio_id=portfolio.id)
+    # mock = Mock()
+    # monkeypatch.setattr("atst.jobs.provision_portfolio", mock)
+    # dispatch_provision_portfolio.run()
+    # mock.delay.assert_called_once_with(portfolio_id=portfolio.id)