#105 Support also releases that are almost EOL
Merged 3 years ago by frantisekz. Opened 3 years ago by frantisekz.

@@ -105,7 +105,8 @@ 

      Returns dict with keys containing active Fedora releases as described by keys.

      "values" key contains list of active Fedora release numbers

      """

-     releases = {"oldstable": (max(fedfind.helpers.get_current_stables()) - 1),

+     releases = {"pre_eol": min(fedfind.helpers.get_current_stables()),

+                 "oldstable": (max(fedfind.helpers.get_current_stables()) - 1),

                  "stable": max(fedfind.helpers.get_current_stables()),

                  "branched": fedfind.helpers.get_current_release(branched=True),

                  "rawhide": (fedfind.helpers.get_current_release(branched=True) + 1)}
@@ -116,6 +117,11 @@ 

          releases["branched_frozen"] = None

      else:

          releases["branched_frozen"] = branched_frozen()

+ 

+     # Filter out pre_eol value if it's actually an oldstable

+     if releases["pre_eol"] == releases["oldstable"]:

+         releases["pre_eol"] = None

+ 

      return releases

  

  

@@ -180,6 +180,7 @@ 

      mocked_bodhi_updates_resp = {"F98": mocked_update_data}

  

      stub_fedora_releases = {

+         "pre_eol": None,

          "oldstable": 96,

          "stable": 97,

          "branched": 98,

@@ -15,6 +15,7 @@ 

  def bz_advanced_releases_stub(what):

      if "fedora_releases" in what:

          return {

+             "pre_eol": None,

              "oldstable": 96,

              "stable": 97,

              "branched": 98,
@@ -74,6 +75,7 @@ 

  

  

      stub_fedora_releases = {

+         "pre_eol": None,

          "oldstable": 96,

          "stable": 97,

          "branched": 98,

@@ -10,6 +10,7 @@ 

  class TestHealthCheck(object):

  

      stub_fedora_releases = {

+         "pre_eol": None,

          "oldstable": 96,

          "stable": 97,

          "branched": 98,

@@ -10,6 +10,7 @@ 

  

  

      stub_fedora_releases = {

+         "pre_eol": None,

          "oldstable": 96,

          "stable": 97,

          "branched": 98,
@@ -73,12 +74,13 @@ 

      def test_get_fedora_releases(self, monkeypatch):

  

          expected_result = {

+             "pre_eol": 95,

              'branched': 98,

              'branched_frozen': True,

              'oldstable': 96,

              'rawhide': 99,

              'stable': 97,

-             'values': [96, 97, 98, 99]

+             'values': [95, 96, 97, 98, 99]

          }

  

          monkeypatch.setattr(fedfind.helpers, 'get_current_stables', mock.MagicMock(return_value=[95,96,97]))

@@ -18,6 +18,7 @@ 

  class TestKoschei(object):

  

      stub_fedora_releases = {

+         "pre_eol": None,

          "oldstable": 96,

          "stable": 97,

          "branched": 98,

@@ -192,6 +192,7 @@ 

          }

  

          stub_fedora_releases = {

+             "pre_eol": None,

              "oldstable": 96,

              "stable": 97,

              "branched": 98,