Merge lp:~gocept/landscape-client/py3-package-taskhandler into lp:~landscape/landscape-client/trunk

[Steffen Allner]

Update landscape.package.taskhandler tests to work with py3 too.

THis MP considers the tests for landscape.package.taskhandler, which did not work with Python 3 as we need hashes to be bytes explicitly.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 988
Branch: lp:~gocept/landscape-client/py3-package-taskhandler
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3693/

review: Approve (test results)

[Daniel Havlik (nilo)]

+1

review: Approve

[Данило Шеган (danilo)]

Looks good.

review: Approve

=== modified file 'landscape/package/tests/test_taskhandler.py'
--- landscape/package/tests/test_taskhandler.py	2017-01-09 14:29:54 +0000
+++ landscape/package/tests/test_taskhandler.py	2017-03-22 08:27:07 +0000
@@ -48,14 +48,14 @@
     def test_use_hash_id_db(self):
 
         # We don't have this hash=>id mapping
-        self.assertEqual(self.store.get_hash_id("hash"), None)
+        self.assertEqual(self.store.get_hash_id(b"hash"), None)
 
         # An appropriate hash=>id database is available
         self.config.data_path = self.makeDir()
         os.makedirs(os.path.join(self.config.data_path, "package", "hash-id"))
         hash_id_db_filename = os.path.join(self.config.data_path, "package",
                                            "hash-id", "uuid_codename_arch")
-        HashIdStore(hash_id_db_filename).set_hash_ids({"hash": 123})
+        HashIdStore(hash_id_db_filename).set_hash_ids({b"hash": 123})
 
         # Fake uuid, codename and arch
         message_store = self.broker_service.message_store
@@ -68,7 +68,7 @@
 
         # Now we do have the hash=>id mapping
         def callback(ignored):
-            self.assertEqual(self.store.get_hash_id("hash"), 123)
+            self.assertEqual(self.store.get_hash_id(b"hash"), 123)
         result.addCallback(callback)
 
         return result

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-22 08:27:07 +0000
+++ py3_ready_tests	2017-03-22 08:27:07 +0000
@@ -3,3 +3,5 @@
 landscape.package.tests.test_store
 landscape.package.tests.test_reporter
 
+landscape.package.tests.test_taskhandler
+