fixes tests

Author: saxix

ruff.toml

@@ -79,14 +79,12 @@ case-sensitive = true
 force-wrap-aliases = true
 combine-as-imports = true
 extra-standard-library = ["path"]
-#default-section = "local-folder"
 known-third-party = ['django']
 known-first-party = ['hope_*']
 known-local-folder = ["country_workspace"]
 no-sections = false
 lines-after-imports = 1
 relative-imports-order = "furthest-to-closest"
-
 section-order = ["future", "standard-library", "third-party", "first-party",  "local-folder",]
 
 

src/country_workspace/models/program.py

@@ -5,11 +5,11 @@
 from strategy_field.fields import StrategyField
 from strategy_field.utils import fqn
 
+from country_workspace.models.office import Office
 from hope_flex_fields.models import DataChecker
 
 from ..validators.registry import NoopValidator, beneficiary_validator_registry
 from .base import BaseModel, Validable
-from .office import Office
 
 if TYPE_CHECKING:
     from django.db.models import QuerySet

tests/test_commands.py

@@ -87,7 +87,7 @@ def test_upgrade(verbosity: int, migrate: int, monkeypatch: pytest.MonkeyPatch,
     out = StringIO()
     SuperUserFactory()
     with mock.patch.dict(os.environ, environment, clear=True):
-        call_command("upgrade", stdout=out, checks=False, verbosity=verbosity)
+        call_command("upgrade", stdout=out, checks=False, verbosity=verbosity, sync_with_hope=False)
     assert "error" not in str(out.getvalue())
 
 
@@ -96,14 +96,14 @@ def test_upgrade_next(mocked_responses: RequestsMock) -> None:
 
     SuperUserFactory()
     out = StringIO()
-    call_command("upgrade", stdout=out, checks=False)
+    call_command("upgrade", stdout=out, checks=False, sync_with_hope=False)
     assert "error" not in str(out.getvalue())
 
 
 def test_upgrade_check(mocked_responses: RequestsMock, admin_user: "User", environment: dict[str, str]) -> None:
     out = StringIO()
     with mock.patch.dict(os.environ, environment, clear=True):
-        call_command("upgrade", stdout=out, checks=True)
+        call_command("upgrade", stdout=out, checks=True, sync_with_hope=False)
 
 
 @pytest.mark.django_db(transaction=True)
@@ -118,7 +118,18 @@ def test_upgrade_admin(mocked_responses: RequestsMock, environment: dict[str, st
 
     out = StringIO()
     with mock.patch.dict(os.environ, environment, clear=True):
-        call_command("upgrade", stdout=out, checks=True, admin_email=email)
+        call_command("upgrade", stdout=out, checks=True, admin_email=email, sync_with_hope=False)
+
+
+@pytest.mark.django_db(transaction=True)
+@pytest.mark.vcr
+@pytest.mark.xdist_group("remote")
+def test_upgrade_sync(environment: dict[str, str]) -> None:
+    out = StringIO()
+    with mock.patch.dict(os.environ, environment, clear=True):
+        call_command(
+            "upgrade", stdout=out, sync_with_hope=True, migrate=False, static=False, prompt=False, checks=False
+        )
 
 
 @pytest.mark.django_db(transaction=True)