Merge lp:~silverdrake11/landscape-charm/log_upgrade_version into lp:landscape-charm

[Kevin Nasto]

Added landscape packages version in event upgrade action log

[Mitch Burton (mitchburton)]

test failure:

======================================================================
FAIL: test_action_upgrade (tests.test_charm.TestCharm)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/perfect5th/Canonical/src/landscape-charm/log_upgrade_version/tests/test_charm.py", line 894, in test_action_upgrade
    self.assertEqual(event.log.call_count, 5)
AssertionError: 9 != 5

Otherwise LGTM

review: Needs Fixing

[lp:~silverdrake11/landscape-charm/log_upgrade_version]

437. By Kevin Nasto on 2023-03-14

Fixed failing test

[Kevin Nasto (silverdrake11)]

> test failure:
>
> ======================================================================
> FAIL: test_action_upgrade (tests.test_charm.TestCharm)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/home/perfect5th/Canonical/src/landscape-
> charm/log_upgrade_version/tests/test_charm.py", line 894, in
> test_action_upgrade
> self.assertEqual(event.log.call_count, 5)
> AssertionError: 9 != 5
>
> Otherwise LGTM

Fixed

[Mitch Burton (mitchburton)]

LGTM then

review: Approve

=== modified file 'src/charm.py'
--- src/charm.py	2023-03-13 21:37:24 +0000
+++ src/charm.py	2023-03-14 18:35:35 +0000
@@ -908,6 +908,8 @@
                 event.log(f"Upgrading {package}...")
                 pkg = apt.DebianPackage.from_apt_cache(package)
                 pkg.ensure(state=apt.PackageState.Latest)
+                installed = apt.DebianPackage.from_installed_package(package)
+                event.log(f"Upgraded to {installed.version}...")
             except PackageNotFoundError as e:
                 logger.error(f"Could not upgrade package {package}. Reason: {e.message}")
                 event.fail(f"Could not upgrade package {package}. Reason: {e.message}")

=== modified file 'tests/test_charm.py'
--- tests/test_charm.py	2023-03-13 21:37:24 +0000
+++ tests/test_charm.py	2023-03-14 18:35:35 +0000
@@ -891,7 +891,7 @@
             apt_mock.DebianPackage.from_apt_cache.return_value = pkg_mock
             self.harness.charm._upgrade(event)
 
-        self.assertEqual(event.log.call_count, 5)
+        self.assertEqual(event.log.call_count, 9)
         self.assertEqual(
             apt_mock.DebianPackage.from_apt_cache.call_count,
             len(LANDSCAPE_PACKAGES)