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

[Steffen Allner]

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

It fixes some bytes/unicode issues in the tests.

This MPs adjust tests for landscape.monitor.packagemonitor for Python 3 and declares hashes explicitly as bytes.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Geoff Teale (tealeg)]

+1 Approve

review: Approve

[Daniel Havlik (nilo)]

+1

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'landscape/monitor/tests/test_packagemonitor.py'
--- landscape/monitor/tests/test_packagemonitor.py	2017-01-09 14:29:54 +0000
+++ landscape/monitor/tests/test_packagemonitor.py	2017-03-30 08:01:23 +0000
@@ -308,12 +308,12 @@
         The package hash=>id map is server-specific, so when we change
         servers, we should reset this map.
         """
-        self.package_store.set_hash_ids({"hash1": 1, "hash2": 2})
+        self.package_store.set_hash_ids({b"hash1": 1, b"hash2": 2})
         self.monitor.add(self.package_monitor)
         self.monitor.reactor.fire("server-uuid-changed", "old", "new")
 
-        self.assertEqual(self.package_store.get_hash_id("hash1"), None)
-        self.assertEqual(self.package_store.get_hash_id("hash2"), None)
+        self.assertEqual(self.package_store.get_hash_id(b"hash1"), None)
+        self.assertEqual(self.package_store.get_hash_id(b"hash2"), None)
 
     def test_changing_server_uuid_wont_clear_hash_ids_with_old_uuid_none(self):
         """
@@ -321,8 +321,8 @@
         talking to a server that knows how to communicate its UUID, so we
         don't want to clear the old hashes in this case.
         """
-        self.package_store.set_hash_ids({"hash1": 1, "hash2": 2})
+        self.package_store.set_hash_ids({b"hash1": 1, b"hash2": 2})
         self.monitor.add(self.package_monitor)
         self.monitor.reactor.fire("server-uuid-changed", None, "new-uuid")
-        self.assertEqual(self.package_store.get_hash_id("hash1"), 1)
-        self.assertEqual(self.package_store.get_hash_id("hash2"), 2)
+        self.assertEqual(self.package_store.get_hash_id(b"hash1"), 1)
+        self.assertEqual(self.package_store.get_hash_id(b"hash2"), 2)

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-30 08:01:23 +0000
+++ py3_ready_tests	2017-03-30 08:01:23 +0000
@@ -14,3 +14,4 @@
 landscape.monitor.tests.test_loadaverage
 landscape.monitor.tests.test_networkdevice
 landscape.monitor.tests.test_networkactivity
+landscape.monitor.tests.test_packagemonitor