[Kimchi-devel] [kimchi-devel][PATCH] Remove unsupported Fedora ISO link

lvroyce at linux.vnet.ibm.com lvroyce at linux.vnet.ibm.com
Wed Mar 11 09:08:02 UTC 2015


From: Royce Lv <lvroyce at linux.vnet.ibm.com>

As most mirrors of fedora repository removed ISOs of Fedora 18 and 19,
remove them from kimchi fedora.json to comply with tests.

Signed-off-by: Royce Lv <lvroyce at linux.vnet.ibm.com>
---
 src/distros.d/fedora.json | 14 --------------
 tests/test_rest.py        |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/distros.d/fedora.json b/src/distros.d/fedora.json
index cba0fe0..bce72d6 100644
--- a/src/distros.d/fedora.json
+++ b/src/distros.d/fedora.json
@@ -1,19 +1,5 @@
 [
     {
-        "name": "Fedora 18",
-        "os_distro": "fedora",
-        "os_arch": "x86_64",
-        "os_version": "18",
-        "path": "http://fedora.mirrors.tds.net/pub/fedora/releases/18/Live/x86_64/Fedora-18-x86_64-Live-Desktop.iso"
-    },
-    {
-        "name": "Fedora 19",
-        "os_distro": "fedora",
-        "os_arch": "x86_64",
-        "os_version": "19",
-        "path": "http://fedora.mirrors.tds.net/pub/fedora/releases/19/Live/x86_64/Fedora-Live-Desktop-x86_64-19-1.iso"
-    },
-    {
         "name": "Fedora 20",
         "os_distro": "fedora",
         "os_arch": "x86_64",
diff --git a/tests/test_rest.py b/tests/test_rest.py
index f90b7e7..c520425 100644
--- a/tests/test_rest.py
+++ b/tests/test_rest.py
@@ -1509,13 +1509,13 @@ class RestTests(unittest.TestCase):
             self.assertIn('path', distro)
 
         # Test in X86
-        ident = "Fedora 19"
+        ident = "Fedora 20"
         resp = self.request('/config/distros/%s' % urllib2.quote(ident)).read()
         distro = json.loads(resp)
         if os.uname()[4] in ['x86_64', 'amd64']:
             self.assertEquals(distro['name'], ident)
             self.assertEquals(distro['os_distro'], "fedora")
-            self.assertEquals(distro['os_version'], "19")
+            self.assertEquals(distro['os_version'], "20")
             self.assertEquals(distro['os_arch'], "x86_64")
             self.assertIn('path', distro)
         else:
-- 
1.9.1




More information about the Kimchi-devel mailing list