Use the existing replacement test

Previously, there were two extra tests to check for correctness
of the fmw_source variable.
This PR moves the check into the main testing chunk.

tests/test_report.py

@@ -55,6 +55,7 @@ def test_uniqueres_replacements(jobdict01):
         "medium": "$MEDIUM$",
         "base_section": "$BASE_SECTION$",
         "version": "$VERSION$",
+        "fmw_source": "$FMW_SOURCE$",
     }
     origbase = copy.deepcopy(basedict)
     ret = fosreport._uniqueres_replacements(jobdict01, basedict)
@@ -72,6 +73,7 @@ def test_uniqueres_replacements(jobdict01):
     # this is a Server dict so we get release-blocking
     assert ret['base_section'] == "Release-blocking environments (x86_64)"
     assert ret['version'] == "27"
+    assert ret['fmw_source'] == "Fedora 27"
     # basedict should not be modified
     assert basedict == origbase
 
@@ -133,44 +135,10 @@ def test_uniqueres_replacements(jobdict01):
         ret = fosreport._uniqueres_replacements(jobdict01, basedict)
     assert ret['base_section'] == 'RPM-based non-blocking environments (x86_64)'
 
-def test_uniqueres_replacements_media_writer_flatpak():
-    """ media_writer_flatpak should use Flathub as the FMW source """
-    job = {
-            "test": "media_writer_flatpak",
-            "settings": {
-                "ARCH": "x86_64",
-                "SUBVARIANT": "Silverblue",
-                "IMAGETYPE": "dvd-ostree",
-                "VERSION": "45",
-            },
-        }
-    tcdict = {
-        "section": "Fedora Media Writer",
-        "env": "$FMW_SOURCE$",
-        "type": "Installation",
-    }
-    result = fosreport._uniqueres_replacements(job, tcdict)
-    assert result["env"] == "Flathub"
-
-def test_uniqueres_replacements_media_writer_default():
-    """ media_writer should use Fedora VERSION as the FMW source """
-    job = {
-            "test": "media_writer",
-            "settings": {
-                "ARCH": "x86_64",
-                "SUBVARIANT": "Workstation",
-                "IMAGETYPE": "live",
-                "VERSION": "45",
-            },
-        }
-    tcdict = {
-        "section": "Fedora Media Writer",
-        "env": "$FMW_SOURCE$",
-        "type": "Installation",
-    }
-    result = fosreport._uniqueres_replacements(job, tcdict)
-    assert result["env"] == "Fedora 45"
-
+    # Correct version (fmw_source) string for Non-Canned vs Canned runs
+    with mock.patch.dict(jobdict01['settings'], {'CANNED': '1'}):
+        ret = fosreport._uniqueres_replacements(jobdict01, basedict)
+    assert ret["fmw_source"] == "Flathub"
 
 class TestGetPassedTcNames:
     """Tests for _get_passed_tcnames."""