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

[Steffen Allner]

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

It fixes the Py3 change in floor division operator.

This MP fixes the landscape.monitor.aptpreferences module and its tests by using floor division explicitly as wee need the division result for a multiplication with a string and as index.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Geoff Teale (tealeg)]

+1

review: Approve

[Daniel Havlik (nilo)]

+1

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'landscape/monitor/aptpreferences.py'
--- landscape/monitor/aptpreferences.py	2017-03-13 15:38:09 +0000
+++ landscape/monitor/aptpreferences.py	2017-03-30 08:24:31 +0000
@@ -46,7 +46,7 @@
         if data == {}:
             return None
 
-        item_size_limit = self.size_limit / len(data.keys())
+        item_size_limit = self.size_limit // len(data.keys())
         for filename, contents in iteritems(data):
             if len(filename) + len(contents) > item_size_limit:
                 truncated_contents_size = item_size_limit - len(filename)

=== modified file 'landscape/monitor/tests/test_aptpreferences.py'
--- landscape/monitor/tests/test_aptpreferences.py	2017-01-10 09:43:40 +0000
+++ landscape/monitor/tests/test_aptpreferences.py	2017-03-30 08:24:31 +0000
@@ -81,12 +81,12 @@
         self.makeDir(path=preferences_directory)
         limit = self.plugin.size_limit
         filename1 = self.makeFile(dirname=preferences_directory,
-                                  content="a" * (limit / 2))
+                                  content="a" * (limit // 2))
         filename2 = self.makeFile(dirname=preferences_directory,
-                                  content="b" * (limit / 2))
+                                  content="b" * (limit // 2))
         self.assertEqual(self.plugin.get_data(),
-                         {filename1: "a" * (limit / 2 - len(filename1)),
-                          filename2: "b" * (limit / 2 - len(filename2))})
+                         {filename1: "a" * (limit // 2 - len(filename1)),
+                          filename2: "b" * (limit // 2 - len(filename2))})
 
     def test_exchange_without_apt_preferences_data(self):
         """

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-30 08:24:31 +0000
+++ py3_ready_tests	2017-03-30 08:24:31 +0000
@@ -15,3 +15,4 @@
 landscape.monitor.tests.test_networkdevice
 landscape.monitor.tests.test_networkactivity
 landscape.monitor.tests.test_packagemonitor
+landscape.monitor.tests.test_aptpreferences