valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version compare standard version strings if available

Browse Source
This commit is contained in:
Tyler Johnson 2019-09-26 17:16:06 -06:00
parent 822f1d3e2a
commit fb1ad29dd8
No known key found for this signature in database
GPG Key ID: 691E31397E27D004
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/modules/test_pkg.py
View File

@ -59,13 +59,14 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
lt = ['0.2.4-0ubuntu1', '0.2.4.1-0ubuntu1'] lt = ['0.2.4-0ubuntu1', '0.2.4.1-0ubuntu1']
eq = ['0.2.4-0ubuntu1', '0.2.4-0ubuntu1'] eq = ['0.2.4-0ubuntu1', '0.2.4-0ubuntu1']
gt = ['0.2.4.1-0ubuntu1', '0.2.4-0ubuntu1'] gt = ['0.2.4.1-0ubuntu1', '0.2.4-0ubuntu1']
elif grains['os_family'] == 'Suse': elif grains['os_family'] == 'Suse':
lt = ['2.3.0-1', '2.3.1-15.1'] lt = ['2.3.0-1', '2.3.1-15.1']
eq = ['2.3.1-15.1', '2.3.1-15.1'] eq = ['2.3.1-15.1', '2.3.1-15.1']
gt = ['2.3.2-15.1', '2.3.1-15.1'] gt = ['2.3.2-15.1', '2.3.1-15.1']
else: else:
self.skipTest('pkg.version_cmp test has not been configured for \'{}\''.format(grains['os_family'])) lt = ['2.3.0', '2.3.1']
eq = ['2.3.1', '2.3.1']
gt = ['2.3.2', '2.3.1']
self.assertEqual(self.run_function(func, lt), -1) self.assertEqual(self.run_function(func, lt), -1)
self.assertEqual(self.run_function(func, eq), 0) self.assertEqual(self.run_function(func, eq), 0)