✨ support RHEL/CentOS/Rocky kernels
This commit is contained in:
		
							parent
							
								
									e5738cadf0
								
							
						
					
					
						commit
						9ee8119ab4
					
				
					 2 changed files with 17 additions and 3 deletions
				
			
		|  | @ -145,6 +145,8 @@ def clean_kernel_version(version): | ||||||
|     version = re.sub('\.(x86_64|i[3-6]86)', '', version) |     version = re.sub('\.(x86_64|i[3-6]86)', '', version) | ||||||
|     # Fedora release |     # Fedora release | ||||||
|     version = re.sub('\.fc\d+', '', version) |     version = re.sub('\.fc\d+', '', version) | ||||||
|  |     # RHEL release | ||||||
|  |     version = re.sub('\.el[\d\._]+$', '', version) | ||||||
| 
 | 
 | ||||||
|     return Version(version) |     return Version(version) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -32,8 +32,18 @@ class CleanKernelVersionTestCase(unittest.TestCase): | ||||||
|             self.assertEqual(clean_kernel_version(dirty), Version(clean)) |             self.assertEqual(clean_kernel_version(dirty), Version(clean)) | ||||||
| 
 | 
 | ||||||
|     def testFedora(self): |     def testFedora(self): | ||||||
|         versions = [('4.0.4-301.fc22.x86_64', '4.0.4-301'), |         versions = [ | ||||||
|                     ('4.0.0-1.fc22', '4.0.0-1')] |                 ('4.0.4-301.fc22.x86_64', '4.0.4-301'), | ||||||
|  |                 ('4.0.0-1.fc22', '4.0.0-1'), | ||||||
|  |         ] | ||||||
|  |         for dirty, clean in versions: | ||||||
|  |             self.assertEqual(clean_kernel_version(dirty), Version(clean)) | ||||||
|  | 
 | ||||||
|  |     def testRHEL(self): | ||||||
|  |         versions = [ | ||||||
|  |                 ('4.18.0-348.12.2.el8_5', '4.18.0-348.12.2'), | ||||||
|  |                 ('4.18.0-348.el8.0.2', '4.18.0-348') | ||||||
|  |         ] | ||||||
|         for dirty, clean in versions: |         for dirty, clean in versions: | ||||||
|             self.assertEqual(clean_kernel_version(dirty), Version(clean)) |             self.assertEqual(clean_kernel_version(dirty), Version(clean)) | ||||||
| 
 | 
 | ||||||
|  | @ -73,11 +83,13 @@ class VersionTestCase(unittest.TestCase): | ||||||
|         self.assertGreater(Version('2.0'), Version('1.0')) |         self.assertGreater(Version('2.0'), Version('1.0')) | ||||||
| 
 | 
 | ||||||
|     def testComparingNonTrivial(self): |     def testComparingNonTrivial(self): | ||||||
|  |         # lower < greater | ||||||
|         versions = [('2.2', '2.12'), |         versions = [('2.2', '2.12'), | ||||||
|                     ('3.12-2', '3.12-12'), |                     ('3.12-2', '3.12-12'), | ||||||
|                     ('2.6.32-5foo0', '2.6.32-5foo1'), |                     ('2.6.32-5foo0', '2.6.32-5foo1'), | ||||||
|                     ('3.4.15-2', '3.16.7-ckt9-3~deb8u1'), |                     ('3.4.15-2', '3.16.7-ckt9-3~deb8u1'), | ||||||
|                     ('3.2.4', '3.2.4+2')] |                     ('3.2.4', '3.2.4+2'), | ||||||
|  |                     ('4.18.0-348', '4.18.0-348.12.2')] | ||||||
| 
 | 
 | ||||||
|         for lower, greater in versions: |         for lower, greater in versions: | ||||||
|             self.assertGreater(Version(greater), Version(lower)) |             self.assertGreater(Version(greater), Version(lower)) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue