Merge ~enr0n/ubiquity:lp2022965-jammy into ubiquity:jammy

[Nick Rosbrook]

Fix test_city_entry unit test following tzdata changes.

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b59f019..28296af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 ubiquity (22.04.20) UNRELEASED; urgency=medium
 
+  [ Steve Langasek ]
   * Whenever removing packages, use apt-get autoremove --purge instead of
     apt-get purge so that no-longer-used dependencies are removed together
     with the package in question, and we do not leave behind any packages
     that will be reported as autoremovable later.  LP: #1925265.
 
+  [ Nick Rosbrook ]
+  * tests: modify test_city_entry to adapt to tzdata update (LP: #2022965)
+
  -- Steve Langasek <[e-mail]>  Fri, 14 Apr 2023 11:34:25 -0700
 
 ubiquity (22.04.19) jammy; urgency=medium
diff --git a/tests/test_timezone.py b/tests/test_timezone.py
index b6d4664..d41e59a 100644
--- a/tests/test_timezone.py
+++ b/tests/test_timezone.py
@@ -52,7 +52,7 @@ class TimezoneTests(unittest.TestCase):
             self.gtk.changed(self.gtk.city_entry)
         m = self.gtk.city_entry.get_completion().get_model()
         results = []
-        expected = (('Eastern', 'United States'), ('Eastern', 'Bahamas'))
+        expected = (('Eastern', 'United States'), ('Eastern', 'Canada'))
         for x in m:
             results.append((x[0], x[2]))
         self.assertEqual(