Merge lp:~ltrager/maas/lp1490709 into lp:~maas-committers/maas/trunk

[Lee Trager]

Use replace instead of rstrip to get rid of 'hwe-' when comparing hwe kernels

When comparing an hwe_kernel and release I mistakenly used lstrip instead of replace to remove 'hwe-'. lstrip accepts a string and removes any character, unordered, out of the string. So 'hwe-w'.lstrip('hwe-') returns '' when I was expecting 'w'. The test case I had for release_a_newer_than_b passed in a single letter as thats all we're really checking anyway. I've modified the test so one of the values always contains 'hwe-'

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'src/maasserver/utils/osystems.py'
--- src/maasserver/utils/osystems.py	2015-08-19 14:09:36 +0000
+++ src/maasserver/utils/osystems.py	2015-09-01 20:58:49 +0000
@@ -230,7 +230,7 @@
     def get_release_num(release):
         release = release.lower()
         if 'hwe-' in release:
-            release = release.lstrip('hwe-')
+            release = release.replace('hwe-', '')
         return ord(release[0])
 
     # Compare release versions based off of the first letter of their
 
=== modified file 'src/maasserver/utils/tests/test_osystems.py'
--- src/maasserver/utils/tests/test_osystems.py	2015-08-19 14:09:36 +0000
+++ src/maasserver/utils/tests/test_osystems.py	2015-09-01 20:58:49 +0000
@@ -311,7 +311,7 @@
         for i in alphabet:
             true_count = 0
             for j in alphabet:
-                if release_a_newer_than_b(i, j):
+                if release_a_newer_than_b('hwe-' + i, j):
                     true_count += 1
             previous_true += 1
             self.assertEqual(previous_true, true_count)