Landscape Client

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

  1. py3-package-facade
  2. Merge into trunk
Proposed by Steffen Allner
Status: Merged
Approved by: Данило Шеган
Approved revision: 991
Merged at revision: 968
Proposed branch: lp:~gocept/landscape-client/py3-package-facade
Merge into: lp:~landscape/landscape-client/trunk
Prerequisite: lp:~gocept/landscape-client/py3-package-store-reporter
Diff against target: 115 lines (+19/-18)
2 files modified
landscape/package/tests/test_facade.py (+18/-18)
py3_ready_tests (+1/-0)
To merge this branch: bzr merge lp:~gocept/landscape-client/py3-package-facade
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Approve
Daniel Havlik (community) Approve
Adam Collard (community) Approve
Review via email: mp+320540@code.launchpad.net

Commit message

Support py2/3 in landscape.package.facade and tests.

Description of the change

This MP considers some test for landscape.package.facade, such as writing bytes to std{out|err} and a change in assertion name between Python 2 and 3.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

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

review: Approve (test results)
Revision history for this message
Adam Collard (adam-collard) wrote :

Looks good - I've made a suggestion inline about tightening up the test and avoiding the PY3 switch.

review: Approve
lp:~gocept/landscape-client/py3-package-facade updated
990. By Steffen Allner

Enforce a fixed field order in stanza.

Revision history for this message
Steffen Allner (sallner) wrote :

Implemented you suggestion.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
Daniel Havlik (nilo) wrote :

+1

review: Approve
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

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

review: Approve (test results)
lp:~gocept/landscape-client/py3-package-facade updated
991. By Steffen Allner

Backmerge from trunk.

Revision history for this message
Steffen Allner (sallner) wrote :

Resolved conflict.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

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

review: Approve (test results)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'landscape/package/tests/test_facade.py'
2--- landscape/package/tests/test_facade.py 2017-03-13 15:38:09 +0000
3+++ landscape/package/tests/test_facade.py 2017-03-22 13:09:27 +0000
4@@ -286,20 +286,20 @@
5 deb_dir = self.makeDir()
6 create_deb(deb_dir, PKGNAME1, PKGDEB1)
7 deb_file = os.path.join(deb_dir, PKGNAME1)
8- stanza = self.facade.get_package_stanza(deb_file).split("\n")
9+ stanza = self.facade.get_package_stanza(deb_file)
10 SHA256 = (
11 "f899cba22b79780dbe9bbbb802ff901b7e432425c264dc72e6bb20c0061e4f26")
12- self.assertItemsEqual(textwrap.dedent("""\
13+ self.assertEqual(textwrap.dedent("""\
14 Package: name1
15+ Architecture: all
16+ Version: version1-release1
17 Priority: optional
18 Section: Group1
19+ Maintainer: Gustavo Niemeyer <gustavo@niemeyer.net>
20 Installed-Size: 28
21- Maintainer: Gustavo Niemeyer <gustavo@niemeyer.net>
22- Architecture: all
23- Version: version1-release1
24 Provides: providesname1
25+ Pre-Depends: prerequirename1 (= prerequireversion1)
26 Depends: requirename1 (= requireversion1)
27- Pre-Depends: prerequirename1 (= prerequireversion1)
28 Recommends: recommendsname1 (= recommendsversion1)
29 Suggests: suggestsname1 (= suggestsversion1)
30 Conflicts: conflictsname1 (= conflictsversion1)
31@@ -310,7 +310,7 @@
32 SHA256: %(sha256)s
33 Description: Summary1
34 Description1
35- """ % {"filename": PKGNAME1, "sha256": SHA256}).split("\n"),
36+ """ % {"filename": PKGNAME1, "sha256": SHA256}),
37 stanza)
38
39 def test_add_channel_deb_dir_creates_packages_file(self):
40@@ -1029,9 +1029,9 @@
41 self.facade.mark_install(foo)
42
43 def print_output(fetch_progress, install_progress):
44- os.write(1, "Stdout output\n")
45- os.write(2, "Stderr output\n")
46- os.write(1, "Stdout output again\n")
47+ os.write(1, b"Stdout output\n")
48+ os.write(2, b"Stderr output\n")
49+ os.write(1, b"Stdout output again\n")
50
51 self.patch_cache_commit(print_output)
52 output = [
53@@ -1054,9 +1054,9 @@
54 self.facade.mark_install(foo)
55
56 def commit(fetch_progress, install_progress):
57- os.write(1, "Stdout output\n")
58- os.write(2, "Stderr output\n")
59- os.write(1, "Stdout output again\n")
60+ os.write(1, b"Stdout output\n")
61+ os.write(2, b"Stderr output\n")
62+ os.write(1, b"Stdout output again\n")
63 raise SystemError("Oops")
64
65 self.facade._cache.commit = commit
66@@ -1084,12 +1084,12 @@
67
68 def commit1(fetch_progress, install_progress):
69 self.facade._cache.commit = commit2
70- os.write(2, "bad stuff!\n")
71+ os.write(2, b"bad stuff!\n")
72 raise LockFailedException("Oops")
73
74 def commit2(fetch_progress, install_progress):
75 install_progress.dpkg_exited = True
76- os.write(1, "good stuff!")
77+ os.write(1, b"good stuff!")
78
79 self.facade._cache.commit = commit1
80 output = [
81@@ -1113,12 +1113,12 @@
82
83 def commit1(fetch_progress, install_progress):
84 self.facade._cache.commit = commit2
85- os.write(2, "bad stuff!\n")
86+ os.write(2, b"bad stuff!\n")
87 raise SystemError("Oops")
88
89 def commit2(fetch_progress, install_progress):
90 install_progress.dpkg_exited = True
91- os.write(1, "good stuff!")
92+ os.write(1, b"good stuff!")
93
94 self.facade._cache.commit = commit1
95 self.assertRaises(TransactionError, self.facade.perform_changes)
96@@ -1216,7 +1216,7 @@
97
98 def commit(fetch_progress, install_progress):
99 install_progress.dpkg_exited = False
100- os.write(1, "Stdout output\n")
101+ os.write(1, b"Stdout output\n")
102
103 self.facade._cache.commit = commit
104 exception = self.assertRaises(
105
106=== modified file 'py3_ready_tests'
107--- py3_ready_tests 2017-03-22 12:33:52 +0000
108+++ py3_ready_tests 2017-03-22 13:09:27 +0000
109@@ -3,6 +3,7 @@
110 landscape.package.tests.test_store
111 landscape.package.tests.test_reporter
112
113+landscape.package.tests.test_facade
114 landscape.package.tests.test_skeleton
115 landscape.package.tests.test_taskhandler
116

Subscribers

People subscribed via source and target branches

to all changes: