test_cpu_times fails with Linux >=3.10

[giampaolo]

From Arfrever...@gmail.com on August 23, 2013 04:03:30

======================================================================
ERROR: test_cpu_times (_linux.LinuxSpecificTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/psutil/test/_linux.py", line 123, in test_cpu_times
    kernel_ver = re.findall('\d.\d.\d', os.uname()[2])[0]
IndexError: list index out of range

----------------------------------------------------------------------

os.uname()[2] is a string starting with e.g. '3.10.9'.

>>> re.findall('\d.\d.\d', '3.10.9')
[]

Truncation of version number is also possible for older Linux versions:

>>> re.findall('\d.\d.\d', '3.9.11')
['3.9.1']

Original issue: http://code.google.com/p/psutil/issues/detail?id=420

[giampaolo]

From Arfrever...@gmail.com on August 22, 2013 19:07:30

Fix:

--- test/_linux.py
+++ test/_linux.py
@@ -120,7 +120,7 @@

     def test_cpu_times(self):
         fields = psutil.cpu_times()._fields
-        kernel_ver = re.findall('\d.\d.\d', os.uname()[2])[0]
+        kernel_ver = re.findall('\d+.\d+.\d+', os.uname()[2])[0]
         kernel_ver_info = tuple(map(int, kernel_ver.split('.')))
         # steal >= 2.6.11
         # guest >= 2.6.24

[giampaolo]

From Arfrever...@gmail.com on August 22, 2013 19:09:20

Actually '.' also should be escaped:

--- test/_linux.py
+++ test/_linux.py
@@ -120,7 +120,7 @@

     def test_cpu_times(self):
         fields = psutil.cpu_times()._fields
-        kernel_ver = re.findall('\d.\d.\d', os.uname()[2])[0]
+        kernel_ver = re.findall('\d+\.\d+\.\d+', os.uname()[2])[0]
         kernel_ver_info = tuple(map(int, kernel_ver.split('.')))
         # steal >= 2.6.11
         # guest >= 2.6.24

[giampaolo]

From g.rodola on August 24, 2013 10:56:25

Pushed in revision 25339c50d117 . Thanks.

Status: Fixed