Merge ~osomon/ubuntu-release-upgrader:firefox-snap into ubuntu-release-upgrader:ubuntu/master

[Olivier Tilloy]

Add the firefox snap to the list of deb2snap transitions, along with gnome-3-38-2004, on which it is built (LP: #1943840).

[Ken VanDine (ken-vandine)]

I think 19.10 should be 21.10?

review: Needs Fixing

[Olivier Tilloy (osomon)]

No, that's just test data, the corresponding test case starts like this:

    def test_prepare_snap_replacement_data(self):
        # Prepare the state for testing
        controller = mock.Mock()
        config = mock.Mock()
        q = DistUpgradeQuirks(controller, config)
        q._from_version = "19.04"
        q._to_version = "19.10"

[Ken VanDine (ken-vandine)]

Looks good to me

review: Approve

diff --git a/DistUpgrade/deb2snap.json b/DistUpgrade/deb2snap.json
index e79fe2d..6207ab5 100644
--- a/DistUpgrade/deb2snap.json
+++ b/DistUpgrade/deb2snap.json
@@ -5,9 +5,16 @@
             "to_channel": "stable",
             "metapkg": "ubuntu-desktop"
         },
+        "firefox": {
+            "deb": "firefox",
+            "metapkg": "ubuntu-desktop"
+        },
         "gnome-3-34-1804": {
             "metapkg": "ubuntu-desktop"
         },
+        "gnome-3-38-2004": {
+            "metapkg": "ubuntu-desktop"
+        },
         "gtk-common-themes": {
             "metapkg": "ubuntu-desktop"
         },
diff --git a/tests/test_quirks.py b/tests/test_quirks.py
index 2e96087..751961c 100644
--- a/tests/test_quirks.py
+++ b/tests/test_quirks.py
@@ -755,6 +755,10 @@ class TestSnapQuirks(unittest.TestCase):
                 make_mock_pkg(
                     name="core18",
                     is_installed=True),
+            'firefox':
+                make_mock_pkg(
+                    name="firefox",
+                    is_installed=True),
             'gnome-3-28-1804':
                 make_mock_pkg(
                     name="gnome-3-28-1804",
@@ -795,10 +799,19 @@ class TestSnapQuirks(unittest.TestCase):
                 'channel': 'stable',
                 'command': 'install',
                 'deb': None, 'snap-id': '1234'},
+             'firefox': {
+                'channel': 'stable/ubuntu-19.10',
+                'command': 'install',
+                'deb': 'firefox',
+                'snap-id': '1234'},
              'gnome-3-34-1804': {
                 'channel': 'stable/ubuntu-19.10',
                 'command': 'install',
                 'deb': None, 'snap-id': '1234'},
+             'gnome-3-38-2004': {
+                'channel': 'stable/ubuntu-19.10',
+                'command': 'install',
+                'deb': None, 'snap-id': '1234'},
              'gnome-logs': {
                 'command': 'remove'},
              'snap-store': {