Merge lp:~gocept/landscape-client/py3-monitor-mountinfo into lp:~landscape/landscape-client/trunk

[Steffen Allner]

This is the Py3 port of landscape.monitor.mountinfo.

It adjusts to Py3 changes in the filter() builtin and the iterator protocol.

This MP considers landscape.monitor.mountinfo and its tests. Fixes where necessary as we can not get a len() from generators and we have to use the builtin next() to call the next item of an iterable.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 992
Branch: lp:~gocept/landscape-client/py3-monitor-mountinfo
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3815/

review: Approve (test results)

[Michael Howitz (mh-gocept)]

LGTM.

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'landscape/monitor/mountinfo.py'
--- landscape/monitor/mountinfo.py	2017-03-10 15:25:44 +0000
+++ landscape/monitor/mountinfo.py	2017-03-29 13:50:32 +0000
@@ -44,8 +44,10 @@
         self.call_on_accepted("mount-info", self.send_messages, True)
 
     def create_messages(self):
-        return filter(None, [self.create_mount_info_message(),
-                             self.create_free_space_message()])
+        return [message
+                for message in [self.create_mount_info_message(),
+                                self.create_free_space_message()]
+                if message is not None]
 
     def create_mount_info_message(self):
         if self._mount_info:

=== modified file 'landscape/monitor/tests/test_mountinfo.py'
--- landscape/monitor/tests/test_mountinfo.py	2017-03-10 15:19:26 +0000
+++ landscape/monitor/tests/test_mountinfo.py	2017-03-29 13:50:32 +0000
@@ -149,7 +149,9 @@
         runs it gets a different value from our sample statvfs()
         function which should cause it to queue new messages.
         """
-        def statvfs(path, multiplier=mock_counter(1).next):
+        counter = mock_counter(1)
+
+        def statvfs(path, multiplier=lambda: next(counter)):
             return os.statvfs_result(
                 (4096, 0, mb(multiplier() * 1000), mb(100), 0, 0, 0, 0, 0, 0))
 
@@ -181,7 +183,9 @@
         messages should only be queued for / after the first message
         is created.
         """
-        def statvfs(path, multiplier=mock_counter(1).next):
+        counter = mock_counter(1)
+
+        def statvfs(path, multiplier=lambda: next(counter)):
             if path == "/":
                 return os.statvfs_result(
                     (4096, 0, mb(1000), mb(100), 0, 0, 0, 0, 0, 0))
@@ -333,7 +337,9 @@
 
     def test_sample_free_space(self):
         """Test collecting information about free space."""
-        def statvfs(path, multiplier=mock_counter(1).next):
+        counter = mock_counter(1)
+
+        def statvfs(path, multiplier=lambda: next(counter)):
             return os.statvfs_result(
                 (4096, 0, mb(1000), mb(multiplier() * 100), 0, 0, 0, 0, 0, 0))
 

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-29 13:50:32 +0000
+++ py3_ready_tests	2017-03-29 13:50:32 +0000
@@ -9,7 +9,7 @@
 
 landscape.monitor.tests.test_activeprocessinfo
 landscape.monitor.tests.test_computeruptime
-
+landscape.monitor.tests.test_mountinfo