almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Update bash to 5.0.*

Browse Source 
so that the tests will pass again on rawhide.
This commit is contained in:
Brian C. Lane 2019-02-18 16:55:36 -08:00
parent 9041174142
commit 2272b2b189
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/composer/test_blueprints.py
View File

@ -26,7 +26,7 @@ from composer.cli.blueprints import blueprints_push, blueprints_freeze, blueprin
diff_entries = [{'new': {'Description': 'Shiny new description'}, 'old': {'Description': 'Old reliable description'}},
{'new': {'Version': '0.3.1'}, 'old': {'Version': '0.1.1'}},
{'new': {'Module': {'name': 'openssh', 'version': '2.8.1'}}, 'old': None},
{'new': None, 'old': {'Module': {'name': 'bash', 'version': '4.*'}}},
{'new': None, 'old': {'Module': {'name': 'bash', 'version': '5.*'}}},
{'new': {'Module': {'name': 'httpd', 'version': '3.8.*'}},
'old': {'Module': {'name': 'httpd', 'version': '3.7.*'}}},
{'new': {'Package': {'name': 'git', 'version': '2.13.*'}}, 'old': None}]
@ -35,7 +35,7 @@ diff_result = [
'Changed Description "Old reliable description" -> "Shiny new description"',
'Changed Version 0.1.1 -> 0.3.1',
'Added Module openssh 2.8.1',
'Removed Module bash 4.*',
'Removed Module bash 5.*',
'Changed Module httpd 3.7.* -> 3.8.*',
'Added Package git 2.13.*']

2
tests/pylorax/blueprints/example-custom-base.toml
View File

@ -4,7 +4,7 @@ version = "0.0.1"
[[packages]]
name = "bash"
version = "4.4.*"
version = "5.0.*"
[customizations]
hostname = "custombase"

2
tests/pylorax/results/custom-base.dict
View File

@ -1 +1 @@
{'name': 'custom-base', 'description': 'A base system with customizations', 'version': '0.0.1', 'groups': [], 'modules': [], 'packages': [{'name': 'bash', 'version': '4.4.*'}], 'customizations': {'hostname': 'custombase', 'sshkey': [{'user': 'root', 'key': 'A SSH KEY FOR ROOT'}]}}
{'name': 'custom-base', 'description': 'A base system with customizations', 'version': '0.0.1', 'groups': [], 'modules': [], 'packages': [{'name': 'bash', 'version': '5.0.*'}], 'customizations': {'hostname': 'custombase', 'sshkey': [{'user': 'root', 'key': 'A SSH KEY FOR ROOT'}]}}

2
tests/pylorax/results/custom-base.toml
View File

@ -4,7 +4,7 @@ version = "0.0.1"
[[packages]]
name = "bash"
version = "4.4.*"
version = "5.0.*"
[customizations]
hostname = "custombase"

4
tests/pylorax/test_projects.py
View File

@ -162,10 +162,10 @@ class ProjectsTest(unittest.TestCase):
def test_projects_depsolve_version(self):
"""Test that depsolving with a partial wildcard version works"""
deps = projects_depsolve(self.dbo, [("bash", "4.*")], [])
deps = projects_depsolve(self.dbo, [("bash", "5.*")], [])
self.assertEqual(deps[1]["name"], "bash")
deps = projects_depsolve(self.dbo, [("bash", "4.4.*")], [])
deps = projects_depsolve(self.dbo, [("bash", "5.0.*")], [])
self.assertEqual(deps[1]["name"], "bash")
def test_projects_depsolve_oldversion(self):

8
tests/pylorax/test_recipes.py
View File

@ -48,7 +48,7 @@ class BasicRecipeTest(unittest.TestCase):
self.input_toml.append((f_toml.read(), result_dict))
self.old_modules = [recipes.RecipeModule("toml", "2.1"),
recipes.RecipeModule("bash", "4.*"),
recipes.RecipeModule("bash", "5.*"),
recipes.RecipeModule("httpd", "3.7.*")]
self.old_packages = [recipes.RecipePackage("python", "2.7.*"),
recipes.RecipePackage("parted", "3.2")]
@ -65,7 +65,7 @@ class BasicRecipeTest(unittest.TestCase):
self.modules_result = [{"new": {"Modules": {"version": "2.8.1", "name": "openssh"}},
"old": None},
{"new": None,
"old": {"Modules": {"name": "bash", "version": "4.*"}}},
"old": {"Modules": {"name": "bash", "version": "5.*"}}},
{"new": {"Modules": {"version": "3.8.*", "name": "httpd"}},
"old": {"Modules": {"version": "3.7.*", "name": "httpd"}}}]
self.packages_result = [{"new": {"Packages": {"name": "git", "version": "2.13.*"}}, "old": None}]
@ -153,7 +153,7 @@ class BasicRecipeTest(unittest.TestCase):
new_recipe = recipes.Recipe("test-recipe", "A recipe used for testing", "0.3.1", self.new_modules, self.new_packages, [])
result = [{'new': {'Version': '0.3.1'}, 'old': {'Version': '0.1.1'}},
{'new': {'Module': {'name': 'openssh', 'version': '2.8.1'}}, 'old': None},
{'new': None, 'old': {'Module': {'name': 'bash', 'version': '4.*'}}},
{'new': None, 'old': {'Module': {'name': 'bash', 'version': '5.*'}}},
{'new': {'Module': {'name': 'httpd', 'version': '3.8.*'}},
'old': {'Module': {'name': 'httpd', 'version': '3.7.*'}}},
{'new': {'Package': {'name': 'git', 'version': '2.13.*'}}, 'old': None}]
@ -486,7 +486,7 @@ groups = []
[[packages]]
name = "bash"
version = "4.4.*"
version = "5.0.*"
[[customizations]]
hostname = "custom-base"