almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix epoch to ouput an int instead of a str

Browse Source 
Also updates the tests.
This commit is contained in:
Brian C. Lane 2018-03-09 10:54:17 -08:00
parent 413964b92f
commit 0ea4eb5206
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pylorax/api/projects.py
View File

@ -83,7 +83,7 @@ def yaps_to_project_info(yaps):
metadata entries are hard-coded to {} metadata entries are hard-coded to {}
""" """
build = {"epoch": yaps.epoch, build = {"epoch": int(yaps.epoch),
"release": yaps.release, "release": yaps.release,
"arch": yaps.arch, "arch": yaps.arch,
"build_time": api_time(yaps.buildtime), "build_time": api_time(yaps.buildtime),
@ -113,7 +113,7 @@ def tm_to_dep(tm):
:rtype: dict :rtype: dict
""" """
return {"name": tm.name, return {"name": tm.name,
"epoch": tm.epoch, "epoch": int(tm.epoch),
"version": tm.version, "version": tm.version,
"release": tm.release, "release": tm.release,
"arch": tm.arch} "arch": tm.arch}
@ -141,10 +141,10 @@ def dep_evra(dep):
:returns: epoch:version-release.arch :returns: epoch:version-release.arch
:rtype: str :rtype: str
""" """
if dep["epoch"] == "0": if dep["epoch"] == 0:
return dep["version"]+"-"+dep["release"]+"."+dep["arch"] return dep["version"]+"-"+dep["release"]+"."+dep["arch"]
else: else:
return dep["epoch"]+":"+dep["version"]+"-"+dep["release"]+"."+dep["arch"] return str(dep["epoch"])+":"+dep["version"]+"-"+dep["release"]+"."+dep["arch"]
def dep_nevra(dep): def dep_nevra(dep):
"""Return the name-epoch:version-release.arch""" """Return the name-epoch:version-release.arch"""

16
tests/pylorax/test_projects.py
View File

@ -26,7 +26,7 @@ from yum.Errors import YumBaseError
from pylorax.api.config import configure, make_yum_dirs from pylorax.api.config import configure, make_yum_dirs
from pylorax.api.projects import api_time, api_changelog, yaps_to_project, yaps_to_project_info from pylorax.api.projects import api_time, api_changelog, yaps_to_project, yaps_to_project_info
from pylorax.api.projects import tm_to_dep, yaps_to_module, projects_list, projects_info, projects_depsolve from pylorax.api.projects import tm_to_dep, yaps_to_module, projects_list, projects_info, projects_depsolve
from pylorax.api.projects import modules_list, modules_info, ProjectsError, dep_evra, dep_nevra, ProjectsError from pylorax.api.projects import modules_list, modules_info, ProjectsError, dep_evra, dep_nevra
from pylorax.api.yumbase import get_base_object from pylorax.api.yumbase import get_base_object
@ -36,7 +36,7 @@ class Yaps(object):
summary = "summary" summary = "summary"
description = "description" description = "description"
url = "url" url = "url"
epoch = "epoch" epoch = 1
release = "release" release = "release"
arch = "arch" arch = "arch"
buildtime = 499222800 buildtime = 499222800
@ -50,7 +50,7 @@ class Yaps(object):
class TM(object): class TM(object):
"""Test class for tm test""" """Test class for tm test"""
name = "name" name = "name"
epoch = "epoch" epoch = 1
version = "version" version = "version"
release = "release" release = "release"
arch = "arch" arch = "arch"
@ -93,7 +93,7 @@ class ProjectsTest(unittest.TestCase):
self.assertEqual(yaps_to_project(y), result) self.assertEqual(yaps_to_project(y), result)
def test_yaps_to_project_info(self): def test_yaps_to_project_info(self):
build = {"epoch":"epoch", build = {"epoch":1,
"release":"release", "release":"release",
"arch":"arch", "arch":"arch",
"build_time":"1985-10-27T01:00:00", "build_time":"1985-10-27T01:00:00",
@ -118,7 +118,7 @@ class ProjectsTest(unittest.TestCase):
def test_tm_to_dep(self): def test_tm_to_dep(self):
result = {"name":"name", result = {"name":"name",
"epoch":"epoch", "epoch":1,
"version":"version", "version":"version",
"release":"release", "release":"release",
"arch":"arch"} "arch":"arch"}
@ -135,7 +135,7 @@ class ProjectsTest(unittest.TestCase):
def test_dep_evra(self): def test_dep_evra(self):
dep = {"arch": "noarch", dep = {"arch": "noarch",
"epoch": "0", "epoch": 0,
"name": "basesystem", "name": "basesystem",
"release": "7.el7", "release": "7.el7",
"version": "10.0"} "version": "10.0"}
@ -143,7 +143,7 @@ class ProjectsTest(unittest.TestCase):
def test_dep_evra_with_epoch_not_zero(self): def test_dep_evra_with_epoch_not_zero(self):
dep = {"arch": "x86_64", dep = {"arch": "x86_64",
"epoch": "2", "epoch": 2,
"name": "tog-pegasus-libs", "name": "tog-pegasus-libs",
"release": "3.el7", "release": "3.el7",
"version": "2.14.1"} "version": "2.14.1"}
@ -151,7 +151,7 @@ class ProjectsTest(unittest.TestCase):
def test_dep_nevra(self): def test_dep_nevra(self):
dep = {"arch": "noarch", dep = {"arch": "noarch",
"epoch": "0", "epoch": 0,
"name": "basesystem", "name": "basesystem",
"release": "7.el7", "release": "7.el7",
"version": "10.0"} "version": "10.0"}