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

[Steffen Allner]

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

It fixes a problem with comparision between int and list.

This MP fixes a test for landscape.monito.processorinfo, which broke because a comparison of list and int is not defined in Python 3.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Adam Collard (adam-collard)]

review: Approve

[Daniel Havlik (nilo)]

+len([1])

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

It's possible that this was an invalid test that we didn't notice under Py2. Perhaps message["processors"] used to be an int? Regardless, the test is correct now.

review: Approve

[Eric Snow (ericsnowcurrently)]

review: Abstain

=== modified file 'landscape/monitor/tests/test_processorinfo.py'
--- landscape/monitor/tests/test_processorinfo.py	2016-06-15 20:57:55 +0000
+++ landscape/monitor/tests/test_processorinfo.py	2017-03-30 08:57:38 +0000
@@ -21,7 +21,7 @@
         """Ensure the plugin can parse /proc/cpuinfo."""
         message = ProcessorInfo().create_message()
         self.assertEqual(message["type"], "processor-info")
-        self.assertTrue(message["processors"] > 0)
+        self.assertTrue(len(message["processors"]) > 0)
 
         for processor in message["processors"]:
             self.assertTrue("processor-id" in processor)

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-30 08:57:38 +0000
+++ py3_ready_tests	2017-03-30 08:57:38 +0000
@@ -16,3 +16,4 @@
 landscape.monitor.tests.test_networkactivity
 landscape.monitor.tests.test_packagemonitor
 landscape.monitor.tests.test_aptpreferences
+landscape.monitor.tests.test_processorinfo