[DPE-7309][DPE-7326] Re-enable upgrade tests (#934)

* Reenable tests

* Update libs

* Linting

Author: dragomirp

lib/charms/operator_libs_linux/v2/snap.py

@@ -102,7 +102,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 10
+LIBPATCH = 11
 
 
 # Regex to locate 7-bit C1 ANSI sequences
@@ -577,6 +577,9 @@ def _refresh(
         if revision:
             args.append(f'--revision="{revision}"')
 
+        if self.confinement == 'classic':
+            args.append('--classic')
+
         if devmode:
             args.append("--devmode")
 

poetry.lock

@@ -6,7 +6,7 @@ package-mode = false
 requires-poetry = ">=2.0.0"
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.12"
 ops = "^2.22.0"
 boto3 = "^1.38.28"
 pgconnstr = "^1.0.1"
@@ -105,7 +105,7 @@ target-version = ["py38"]
 [tool.ruff]
 # preview and explicit preview are enabled for CPY001
 preview = true
-target-version = "py310"
+target-version = "py312"
 src = ["src", "."]
 line-length = 99
 

pyproject.toml

@@ -11,7 +11,7 @@
 import shutil
 import tempfile
 import time
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from io import BytesIO
 from pathlib import Path
 from subprocess import TimeoutExpired, run
@@ -421,9 +421,7 @@ def _generate_backup_list_output(self) -> str:
                 backup_reference, _ = self._parse_backup_id(backup["reference"][-1])
             lsn_start_stop = f"{backup['lsn']['start']} / {backup['lsn']['stop']}"
             time_start, time_stop = (
-                datetime.strftime(
-                    datetime.fromtimestamp(stamp, timezone.utc), "%Y-%m-%dT%H:%M:%SZ"
-                )
+                datetime.strftime(datetime.fromtimestamp(stamp, UTC), "%Y-%m-%dT%H:%M:%SZ")
                 for stamp in backup["timestamp"].values()
             )
             backup_timeline = (
@@ -526,7 +524,7 @@ def _list_timelines(self) -> dict[str, tuple[str, str]]:
 
         return dict[str, tuple[str, str]]({
             datetime.strftime(
-                datetime.fromtimestamp(timeline_object["time"], timezone.utc),
+                datetime.fromtimestamp(timeline_object["time"], UTC),
                 BACKUP_ID_FORMAT,
             ): (
                 timeline.split("/")[1],
@@ -574,8 +572,8 @@ def _parse_psql_timestamp(self, timestamp: str) -> datetime:
         t = re.sub(r"\.(\d+)", lambda x: f".{x[1]:06}", t)
         dt = datetime.fromisoformat(t)
         # Convert to the timezone-naive
-        if dt.tzinfo is not None and dt.tzinfo is not timezone.utc:
-            dt = dt.astimezone(tz=timezone.utc)
+        if dt.tzinfo is not None and dt.tzinfo is not UTC:
+            dt = dt.astimezone(tz=UTC)
         return dt.replace(tzinfo=None)
 
     def _parse_backup_id(self, label) -> tuple[str, str]:

src/backups.py

@@ -7,7 +7,6 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
-from .. import markers
 from ..helpers import (
     CHARM_BASE,
     db_connect,
@@ -161,7 +160,6 @@ async def test_forceful_restart_without_data_and_transaction_logs(
 
 
 @pytest.mark.abort_on_fail
-@markers.amd64_only
 async def test_network_cut(ops_test: OpsTest, continuous_writes, primary_start_timeout):
     """Completely cut and restore network."""
     # Locate primary unit.
@@ -250,7 +248,6 @@ async def test_network_cut(ops_test: OpsTest, continuous_writes, primary_start_t
 
 
 @pytest.mark.abort_on_fail
-@markers.amd64_only
 async def test_network_cut_without_ip_change(
     ops_test: OpsTest, continuous_writes, primary_start_timeout
 ):

tests/integration/ha_tests/test_self_healing_3.py

@@ -2,7 +2,6 @@
 # Copyright 2021 Canonical Ltd.
 # See LICENSE file for licensing details.
 
-import asyncio
 import logging
 
 import pytest
@@ -174,7 +173,7 @@ async def test_app_resources_conflicts_v3(ops_test: OpsTest, charm: str):
             await ops_test.model.wait_for_idle(
                 apps=[DUP_DATABASE_APP_NAME], timeout=60, idle_period=30, status="waiting"
             )
-        except asyncio.TimeoutError:
+        except TimeoutError:
             logger.info("Application is not in waiting state. Checking logs...")
 
         for attempt in Retrying(stop=stop_after_delay(60 * 10), wait=wait_fixed(3), reraise=True):

tests/integration/ha_tests/test_smoke.py

@@ -5,6 +5,3 @@ execute: |
   tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
 artifacts:
   - allure-results
-systems:
-  - -ubuntu-24.04
-  - -ubuntu-24.04-arm

tests/spread/test_upgrade.py/task.yaml

@@ -5,6 +5,3 @@ execute: |
   tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
 artifacts:
   - allure-results
-systems:
-  - -ubuntu-24.04
-  - -ubuntu-24.04-arm