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

[Steffen Allner]

Declare hashes as bytestrings in landscape/package/tests/helpers.py to make landscape.package.skeleton tests pass with py3.

This MP considers the tests for landscape.package.skeleton, which were mainly broken because of hashes not explicitly being declared as bytes.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[Steffen Allner (sallner)]

When executing the tests with my locale another error occured, which is mainly the different behaviour of apt.chache.Chache, which returns better decoded package.candidate.description

see:
http://paste.ubuntu.com/24227615/

Is this intended behaviour? Then I should maybe switch also to LC_ALL=C for all tests on my machine.

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Daniel Havlik (nilo)]

Diff: +1

I can't see a relation of the question above about the locale and this change. This should be sorted out seperately.

review: Approve

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

Right: tests should not be locale dependent (it indicates a problem with what type of strings are being passed around somewhere, iow, code or tests are not deterministic), but you can fix that in a separate branch.

Please make sure to create a card for it in the trello board.

review: Approve

[🤖 Landscape Builder (landscape-builder)]

Attempt to merge into lp:landscape-client failed due to conflicts:

text conflict in py3_ready_tests

[lp:~gocept/landscape-client/py3-package-skeleton]

989. By Steffen Allner on 2017-03-22

Backmerge from trunk.

[Steffen Allner (sallner)]

Resolved the conflict.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

=== modified file 'landscape/package/tests/helpers.py'
--- landscape/package/tests/helpers.py	2017-03-21 12:43:13 +0000
+++ landscape/package/tests/helpers.py	2017-03-22 12:34:23 +0000
@@ -320,15 +320,15 @@
 HASH1 = base64.decodestring(b"/ezv4AefpJJ8DuYFSq4RiEHJYP4=")
 HASH2 = base64.decodestring(b"glP4DwWOfMULm0AkRXYsH/exehc=")
 HASH3 = base64.decodestring(b"NJM05mj86veaSInYxxqL1wahods=")
-HASH_MINIMAL = "6\xce\x8f\x1bM\x82MWZ\x1a\xffjAc(\xdb(\xa1\x0eG"
+HASH_MINIMAL = b"6\xce\x8f\x1bM\x82MWZ\x1a\xffjAc(\xdb(\xa1\x0eG"
 HASH_SIMPLE_RELATIONS = (
-    "'#\xab&k\xe6\xf5E\xcfB\x9b\xceO7\xe6\xec\xa9\xddY\xaa")
+    b"'#\xab&k\xe6\xf5E\xcfB\x9b\xceO7\xe6\xec\xa9\xddY\xaa")
 HASH_VERSION_RELATIONS = (
-    '\x84\xc9\xb4\xb3\r\x95\x16\x03\x95\x98\xc0\x14u\x06\xf7eA\xe65\xd1')
+    b"\x84\xc9\xb4\xb3\r\x95\x16\x03\x95\x98\xc0\x14u\x06\xf7eA\xe65\xd1")
 HASH_MULTIPLE_RELATIONS = (
-    '\xec\xcdi\xdc\xde-\r\xc3\xd3\xc9s\x84\xe4\xc3\xd6\xc4\x12T\xa6\x0e')
+    b"\xec\xcdi\xdc\xde-\r\xc3\xd3\xc9s\x84\xe4\xc3\xd6\xc4\x12T\xa6\x0e")
 HASH_OR_RELATIONS = (
-    '\xa1q\xf4*\x1c\xd4L\xa1\xca\xf1\xfa?\xc3\xc7\x9f\x88\xd53B\xc9')
+    b"\xa1q\xf4*\x1c\xd4L\xa1\xca\xf1\xfa?\xc3\xc7\x9f\x88\xd53B\xc9")
 
 
 def create_deb(target_dir, pkg_name, pkg_data):

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-22 08:24:47 +0000
+++ py3_ready_tests	2017-03-22 12:34:23 +0000
@@ -3,5 +3,6 @@
 landscape.package.tests.test_store
 landscape.package.tests.test_reporter
 
+landscape.package.tests.test_skeleton
 landscape.package.tests.test_taskhandler