#110 Package versions: Support new format of Pagure data
Merged 3 years ago by frantisekz. Opened 3 years ago by frantisekz.

file modified
+1 -1
@@ -168,7 +168,7 @@ 

          # Exclude ELN for now

          if "ELN" in release:

              continue

-         formatted_release = release_from_dist(release)

+         formatted_release = release_from_dist(release.replace("-",""))

          try:

              versions[formatted_release]["stable"] = bodhi_versions["updates"][release]["stable"]

          except KeyError:

@@ -43,8 +43,9 @@ 

  

      stub_pagure_versions_complete = {

          "updates": {

-             "EL99": {"stable": None, "testing": None},

-             "EL100": {"stable": None, "testing": None},

+             "EL98": {"stable": "package-80.0.1-1.el98", "testing": None},

+             "EPEL-99": {"stable": "package-80.0.1-1.el99", "testing": None},

+             "EPEL-100": {"stable": "package-80.0.1-1.el100", "testing": None},

              "F96": {"stable": "package-80.0.1-1.fc96", "testing": "package-80.0.1-2.fc96"},

              "F97": {"stable": "package-80.0.1-1.fc97", "testing": "package-80.0.1-2.fc97"},

              "F98": {"stable": "package-80.0.1-1.fc98", "testing": "package-80.0.1-1.fc98"},
@@ -183,8 +184,9 @@ 

  

      def test_pagure_versions(self, monkeypatch):

          pagure_versions_result = {

-             "EPEL 1": {"stable": None, "testing": None},

-             "EPEL 2": {"stable": None, "testing": None},

+             "EPEL 98": {"stable": None, "testing": None},

+             "EPEL 99": {"stable": None, "testing": None},

+             "EPEL 100": {"stable": None, "testing": None},

              "Fedora 96": {"stable": "package-80.0.1-1.fc96", "testing": "package-80.0.1-2.fc96"},

              "Fedora 97": {"stable": "package-80.0.1-1.fc97", "testing": "package-80.0.1-2.fc97"},

              "Fedora 98": {"stable": "package-80.0.1-1.fc98", "testing": "package-80.0.1-1.fc98"},
@@ -202,10 +204,16 @@ 

  

          # Force EPEL Releases for tests

          # This is usually defined in settings.py by real values, so we can't put it in config.py TEST block

-         app.config["EPEL_RELEASES"] = [1, 2]

+         app.config["EPEL_RELEASES"] = [98, 99, 100]

  

          monkeypatch.setattr(CACHE, 'get', mock.MagicMock(return_value=stub_fedora_releases))

          monkeypatch.setattr(pagure, 'get_json', stub_get_json_for_pagure_versions)

  

-         assert pagure.get_package_versions("completePackage") == pagure_versions_result

          assert pagure.get_package_versions("package") == pagure_versions_result

+ 

+         # Let's add EPEL versions for complete run

+         pagure_versions_result["EPEL 98"] = {"stable": "package-80.0.1-1.el98", "testing": None}

+         pagure_versions_result["EPEL 99"] = {"stable": "package-80.0.1-1.el99", "testing": None}

+         pagure_versions_result["EPEL 100"] = {"stable": "package-80.0.1-1.el100", "testing": None}

+ 

+         assert pagure.get_package_versions("completePackage") == pagure_versions_result

Pagure changed it's format of returning package versions for EPEL releases.

It used to be:

{ELXX: {"stable": "version", "testing": "version"}, ...}

Now, it is:

{EPEL-XX: {"stable": "version", "testing": "version"}, ...}

Build succeeded.

Pull-Request has been merged by frantisekz

3 years ago