launchpad-buildd

Merge lp:~cjwatson/launchpad-buildd/rename-slavebin into lp:launchpad-buildd

  1. rename-slavebin
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 364
Proposed branch: lp:~cjwatson/launchpad-buildd/rename-slavebin
Merge into: lp:launchpad-buildd
Diff against target: 911 lines (+145/-193)
19 files modified
bin/sbuild-package (+1/-1)
debian/changelog (+2/-0)
debian/launchpad-buildd.install (+5/-5)
debian/launchpad-buildd.links (+1/-1)
lpbuildd/binarypackage.py (+1/-1)
lpbuildd/slave.py (+3/-3)
lpbuildd/sourcepackagerecipe.py (+1/-1)
lpbuildd/target/build_snap.py (+2/-2)
lpbuildd/target/tests/test_build_snap.py (+4/-4)
lpbuildd/tests/buildlog (+4/-4)
lpbuildd/tests/buildlog.long (+57/-57)
lpbuildd/tests/test_1.diff (+1/-1)
lpbuildd/tests/test_2.diff (+7/-6)
lpbuildd/tests/test_binarypackage.py (+10/-17)
lpbuildd/tests/test_debian.py (+22/-43)
lpbuildd/tests/test_livefs.py (+3/-6)
lpbuildd/tests/test_snap.py (+7/-14)
lpbuildd/tests/test_sourcepackagerecipe.py (+7/-14)
lpbuildd/tests/test_translationtemplatesbuildmanager.py (+7/-13)
To merge this branch: bzr merge lp:~cjwatson/launchpad-buildd/rename-slavebin
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+362974@code.launchpad.net

Commit message

Move /usr/share/launchpad-buildd/slavebin to /usr/share/launchpad-buildd/bin.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/sbuild-package'
2--- bin/sbuild-package 2017-08-03 13:13:08 +0000
3+++ bin/sbuild-package 2019-02-11 12:23:51 +0000
4@@ -82,5 +82,5 @@
5 ;;
6 esac
7
8-$SBUILD "$@" | /usr/share/launchpad-buildd/slavebin/check-implicit-pointer-functions --inline $WARN
9+$SBUILD "$@" | /usr/share/launchpad-buildd/bin/check-implicit-pointer-functions --inline $WARN
10 exit $?
11
12=== modified file 'debian/changelog'
13--- debian/changelog 2019-02-11 11:57:56 +0000
14+++ debian/changelog 2019-02-11 12:23:51 +0000
15@@ -4,6 +4,8 @@
16 * Rename slave-prep to builder-prep.
17 * Generalise snap channel handling slightly, allowing channel selection
18 for core16 and core18.
19+ * Move /usr/share/launchpad-buildd/slavebin to
20+ /usr/share/launchpad-buildd/bin.
21
22 -- Colin Watson <cjwatson@ubuntu.com> Fri, 08 Feb 2019 15:09:35 +0000
23
24
25=== modified file 'debian/launchpad-buildd.install'
26--- debian/launchpad-buildd.install 2019-02-08 15:54:20 +0000
27+++ debian/launchpad-buildd.install 2019-02-11 12:23:51 +0000
28@@ -1,8 +1,8 @@
29-bin/builder-prep usr/share/launchpad-buildd/slavebin
30-bin/buildrecipe usr/share/launchpad-buildd/slavebin
31-bin/in-target usr/share/launchpad-buildd/slavebin
32-bin/sbuild-package usr/share/launchpad-buildd/slavebin
33-bin/snap-git-proxy usr/share/launchpad-buildd/slavebin
34+bin/builder-prep usr/share/launchpad-buildd/bin
35+bin/buildrecipe usr/share/launchpad-buildd/bin
36+bin/in-target usr/share/launchpad-buildd/bin
37+bin/sbuild-package usr/share/launchpad-buildd/bin
38+bin/snap-git-proxy usr/share/launchpad-buildd/bin
39 buildd-genconfig usr/share/launchpad-buildd
40 debian/upgrade-config usr/share/launchpad-buildd
41 default/launchpad-buildd etc/default
42
43=== modified file 'debian/launchpad-buildd.links'
44--- debian/launchpad-buildd.links 2017-11-24 13:31:54 +0000
45+++ debian/launchpad-buildd.links 2019-02-11 12:23:51 +0000
46@@ -1,2 +1,2 @@
47 #! /usr/bin/dh-exec
48-${LIBDIR}/lpbuildd/check_implicit_pointer_functions.py usr/share/launchpad-buildd/slavebin/check-implicit-pointer-functions
49+${LIBDIR}/lpbuildd/check_implicit_pointer_functions.py usr/share/launchpad-buildd/bin/check-implicit-pointer-functions
50
51=== modified file 'lpbuildd/binarypackage.py'
52--- lpbuildd/binarypackage.py 2018-10-19 06:41:14 +0000
53+++ lpbuildd/binarypackage.py 2019-02-11 12:23:51 +0000
54@@ -94,7 +94,7 @@
55
56 def __init__(self, slave, buildid, **kwargs):
57 DebianBuildManager.__init__(self, slave, buildid, **kwargs)
58- self._sbuildpath = os.path.join(self._slavebin, "sbuild-package")
59+ self._sbuildpath = os.path.join(self._bin, "sbuild-package")
60
61 @property
62 def chroot_path(self):
63
64=== modified file 'lpbuildd/slave.py'
65--- lpbuildd/slave.py 2019-02-08 15:54:20 +0000
66+++ lpbuildd/slave.py 2019-02-11 12:23:51 +0000
67@@ -138,9 +138,9 @@
68 reactor = default_reactor
69 self._reactor = reactor
70 self._sharepath = slave._config.get("slave", "sharepath")
71- self._slavebin = os.path.join(self._sharepath, "slavebin")
72- self._preppath = os.path.join(self._slavebin, "builder-prep")
73- self._intargetpath = os.path.join(self._slavebin, "in-target")
74+ self._bin = os.path.join(self._sharepath, "bin")
75+ self._preppath = os.path.join(self._bin, "builder-prep")
76+ self._intargetpath = os.path.join(self._bin, "in-target")
77 self._subprocess = None
78 self._reaped_states = set()
79 self.is_archive_private = False
80
81=== modified file 'lpbuildd/sourcepackagerecipe.py'
82--- lpbuildd/sourcepackagerecipe.py 2018-10-19 06:41:14 +0000
83+++ lpbuildd/sourcepackagerecipe.py 2019-02-11 12:23:51 +0000
84@@ -62,7 +62,7 @@
85 :param buildid: The id of the build (a str).
86 """
87 DebianBuildManager.__init__(self, slave, buildid)
88- self.build_recipe_path = os.path.join(self._slavebin, "buildrecipe")
89+ self.build_recipe_path = os.path.join(self._bin, "buildrecipe")
90
91 def initiate(self, files, chroot, extra_args):
92 """Initiate a build with a given set of files and chroot.
93
94=== modified file 'lpbuildd/target/build_snap.py'
95--- lpbuildd/target/build_snap.py 2019-02-07 11:52:09 +0000
96+++ lpbuildd/target/build_snap.py 2019-02-11 12:23:51 +0000
97@@ -77,7 +77,7 @@
98
99 def __init__(self, args, parser):
100 super(BuildSnap, self).__init__(args, parser)
101- self.slavebin = os.path.dirname(sys.argv[0])
102+ self.bin = os.path.dirname(sys.argv[0])
103
104 def run_build_command(self, args, env=None, **kwargs):
105 """Run a build command in the target.
106@@ -158,7 +158,7 @@
107 "snapcraft"])
108 if self.args.proxy_url:
109 self.backend.copy_in(
110- os.path.join(self.slavebin, "snap-git-proxy"),
111+ os.path.join(self.bin, "snap-git-proxy"),
112 "/usr/local/bin/snap-git-proxy")
113 self.install_svn_servers()
114
115
116=== modified file 'lpbuildd/target/tests/test_build_snap.py'
117--- lpbuildd/target/tests/test_build_snap.py 2019-02-07 11:52:09 +0000
118+++ lpbuildd/target/tests/test_build_snap.py 2019-02-11 12:23:51 +0000
119@@ -141,10 +141,10 @@
120 "test-snap",
121 ]
122 build_snap = parse_args(args=args).operation
123- build_snap.slavebin = "/slavebin"
124- self.useFixture(FakeFilesystem()).add("/slavebin")
125- os.mkdir("/slavebin")
126- with open("/slavebin/snap-git-proxy", "w") as proxy_script:
127+ build_snap.bin = "/builderbin"
128+ self.useFixture(FakeFilesystem()).add("/builderbin")
129+ os.mkdir("/builderbin")
130+ with open("/builderbin/snap-git-proxy", "w") as proxy_script:
131 proxy_script.write("proxy script\n")
132 os.fchmod(proxy_script.fileno(), 0o755)
133 build_snap.install()
134
135=== modified file 'lpbuildd/tests/buildlog'
136--- lpbuildd/tests/buildlog 2017-08-05 10:06:15 +0000
137+++ lpbuildd/tests/buildlog 2019-02-11 12:23:51 +0000
138@@ -1,10 +1,10 @@
139-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
140+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
141 Unpacking chroot for build 370614-896976
142-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
143+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
144 Mounting chroot for build 370614-896976
145-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
146+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
147 Attempting OGRE for universe in build-370614-896976
148-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
149+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
150 Updating debian chroot for build 370614-896976
151 Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
152 Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
153
154=== modified file 'lpbuildd/tests/buildlog.long'
155--- lpbuildd/tests/buildlog.long 2017-08-05 10:06:15 +0000
156+++ lpbuildd/tests/buildlog.long 2019-02-11 12:23:51 +0000
157@@ -1,10 +1,10 @@
158-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
159+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
160 Unpacking chroot for build 370614-896976
161-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
162+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
163 Mounting chroot for build 370614-896976
164-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
165+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
166 Attempting OGRE for universe in build-370614-896976
167-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
168+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
169 Updating debian chroot for build 370614-896976
170 Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
171 Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
172@@ -22,59 +22,59 @@
173 After unpacking 94.2kB of additional disk space will be used.
174 (Reading database ... 8942 files and directories currently installed.)
175 socat STDIO PROXY:snap-proxy.launchpad.dev:github.com:443,proxyport=3128,proxyauth=user:blah
176-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
177-Unpacking chroot for build 370614-896976
178-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
179-Mounting chroot for build 370614-896976
180-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
181-Attempting OGRE for universe in build-370614-896976
182-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
183-Updating debian chroot for build 370614-896976
184-Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
185-Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
186-Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
187-Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
188-Fetched 5142kB in 5s (1012kB/s)
189-Reading package lists...
190-Reading package lists...
191-Building dependency tree...
192-The following packages will be upgraded:
193- apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
194- sysvutils util-linux
195-12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
196-Need to get 0B/2832kB of archives.
197-After unpacking 94.2kB of additional disk space will be used.
198-(Reading database ... 8942 files and directories currently installed.)
199-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
200-Unpacking chroot for build 370614-896976
201-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
202-Mounting chroot for build 370614-896976
203-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
204-Attempting OGRE for universe in build-370614-896976
205-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
206-Updating debian chroot for build 370614-896976
207-Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
208-Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
209-Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
210-Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
211-Fetched 5142kB in 5s (1012kB/s)
212-Reading package lists...
213-Reading package lists...
214-Building dependency tree...
215-The following packages will be upgraded:
216- apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
217- sysvutils util-linux
218-12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
219-Need to get 0B/2832kB of archives.
220-After unpacking 94.2kB of additional disk space will be used.
221-(Reading database ... 8942 files and directories currently installed.)
222-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
223-Unpacking chroot for build 370614-896976
224-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
225-Mounting chroot for build 370614-896976
226-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
227-Attempting OGRE for universe in build-370614-896976
228-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
229+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
230+Unpacking chroot for build 370614-896976
231+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
232+Mounting chroot for build 370614-896976
233+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
234+Attempting OGRE for universe in build-370614-896976
235+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
236+Updating debian chroot for build 370614-896976
237+Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
238+Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
239+Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
240+Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
241+Fetched 5142kB in 5s (1012kB/s)
242+Reading package lists...
243+Reading package lists...
244+Building dependency tree...
245+The following packages will be upgraded:
246+ apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
247+ sysvutils util-linux
248+12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
249+Need to get 0B/2832kB of archives.
250+After unpacking 94.2kB of additional disk space will be used.
251+(Reading database ... 8942 files and directories currently installed.)
252+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
253+Unpacking chroot for build 370614-896976
254+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
255+Mounting chroot for build 370614-896976
256+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
257+Attempting OGRE for universe in build-370614-896976
258+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
259+Updating debian chroot for build 370614-896976
260+Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
261+Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
262+Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
263+Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
264+Fetched 5142kB in 5s (1012kB/s)
265+Reading package lists...
266+Reading package lists...
267+Building dependency tree...
268+The following packages will be upgraded:
269+ apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
270+ sysvutils util-linux
271+12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
272+Need to get 0B/2832kB of archives.
273+After unpacking 94.2kB of additional disk space will be used.
274+(Reading database ... 8942 files and directories currently installed.)
275+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
276+Unpacking chroot for build 370614-896976
277+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
278+Mounting chroot for build 370614-896976
279+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
280+Attempting OGRE for universe in build-370614-896976
281+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
282 Updating debian chroot for build 370614-896976
283 Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
284 Get:2 http://must:go@ftpmaster.internal gutsy Release [65.9kB]
285
286=== modified file 'lpbuildd/tests/test_1.diff'
287--- lpbuildd/tests/test_1.diff 2017-08-05 10:06:15 +0000
288+++ lpbuildd/tests/test_1.diff 2019-02-11 12:23:51 +0000
289@@ -5,7 +5,7 @@
290 @@ -6,9 +6,9 @@
291
292 Attempting OGRE for universe in build-370614-896976
293- RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
294+ RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
295 Updating debian chroot for build 370614-896976
296 -Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
297 +Get:1 http://ftpmaster.internal gutsy Release.gpg [191B]
298
299=== modified file 'lpbuildd/tests/test_2.diff'
300--- lpbuildd/tests/test_2.diff 2017-08-05 10:06:15 +0000
301+++ lpbuildd/tests/test_2.diff 2019-02-11 12:23:51 +0000
302@@ -2,13 +2,14 @@
303
304 +++
305
306-@@ -1,12 +1,11 @@
307+@@ -1,13 +1,12 @@
308
309--are/launchpad-buildd/slavebin/mount-chroot 370614-896976
310+-or build 370614-896976
311+ RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
312 Mounting chroot for build 370614-896976
313- RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
314+ RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
315 Attempting OGRE for universe in build-370614-896976
316- RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
317+ RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
318 Updating debian chroot for build 370614-896976
319 -Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
320 +Get:1 http://ftpmaster.internal gutsy Release.gpg [191B]
321@@ -18,10 +19,10 @@
322 Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
323 Fetched 5142kB in 5s (1012kB/s)
324 Reading package lists...
325-@@ -27,9 +26,9 @@
326+@@ -28,9 +27,9 @@
327
328 Attempting OGRE for universe in build-370614-896976
329- RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
330+ RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
331 Updating debian chroot for build 370614-896976
332 -Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
333 -Get:2 http://must:go@ftpmaster.internal gutsy Release [65.9kB]
334
335=== modified file 'lpbuildd/tests/test_binarypackage.py'
336--- lpbuildd/tests/test_binarypackage.py 2018-10-05 15:43:40 +0000
337+++ lpbuildd/tests/test_binarypackage.py 2019-02-11 12:23:51 +0000
338@@ -133,7 +133,7 @@
339 self.assertState(
340 BinaryPackageBuildState.SBUILD,
341 [
342- 'sharepath/slavebin/sbuild-package', 'sbuild-package',
343+ 'sharepath/bin/sbuild-package', 'sbuild-package',
344 self.buildid, 'i386', 'warty',
345 '-c', 'chroot:build-' + self.buildid,
346 '--arch=i386', '--dist=warty', '--nolog',
347@@ -159,8 +159,7 @@
348 yield self.buildmanager.iterate(exit_code)
349 self.assertState(
350 BinaryPackageBuildState.SBUILD,
351- ['sharepath/slavebin/in-target', 'in-target',
352- 'scan-for-processes',
353+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
354 '--backend=chroot', '--series=warty', '--arch=i386',
355 self.buildid], final=False)
356
357@@ -168,8 +167,7 @@
358 self.buildmanager.iterateReap(self.getState(), 0)
359 self.assertState(
360 BinaryPackageBuildState.UMOUNT,
361- ['sharepath/slavebin/in-target', 'in-target',
362- 'umount-chroot',
363+ ['sharepath/bin/in-target', 'in-target', 'umount-chroot',
364 '--backend=chroot', '--series=warty', '--arch=i386',
365 self.buildid], final=True)
366
367@@ -211,7 +209,7 @@
368 yield self.buildmanager.iterate(0)
369 self.assertState(
370 BinaryPackageBuildState.SBUILD,
371- ['sharepath/slavebin/sbuild-package', 'sbuild-package',
372+ ['sharepath/bin/sbuild-package', 'sbuild-package',
373 self.buildid, 'i386', 'warty',
374 '-c', 'chroot:build-' + self.buildid,
375 '--arch=i386', '--dist=warty', '--nolog',
376@@ -241,7 +239,7 @@
377 yield self.buildmanager.iterate(0)
378 self.assertState(
379 BinaryPackageBuildState.SBUILD,
380- ['sharepath/slavebin/sbuild-package', 'sbuild-package',
381+ ['sharepath/bin/sbuild-package', 'sbuild-package',
382 self.buildid, 'i386', 'warty',
383 '-c', 'chroot:build-' + self.buildid,
384 '--arch=i386', '--dist=warty', '--nolog',
385@@ -267,8 +265,7 @@
386 self.buildmanager.abort()
387 self.assertState(
388 BinaryPackageBuildState.SBUILD,
389- ['sharepath/slavebin/in-target', 'in-target',
390- 'scan-for-processes',
391+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
392 '--backend=chroot', '--series=warty', '--arch=i386',
393 self.buildid], final=False)
394 self.assertFalse(self.slave.wasCalled('buildFail'))
395@@ -289,8 +286,7 @@
396 self.buildmanager.abort()
397 self.assertState(
398 BinaryPackageBuildState.SBUILD,
399- ['sharepath/slavebin/in-target', 'in-target',
400- 'scan-for-processes',
401+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
402 '--backend=chroot', '--series=warty', '--arch=i386',
403 self.buildid], final=False)
404 self.assertFalse(self.slave.wasCalled('builderFail'))
405@@ -315,8 +311,7 @@
406 yield self.buildmanager.iterate(128 + 9) # SIGKILL
407 self.assertState(
408 BinaryPackageBuildState.UMOUNT,
409- ['sharepath/slavebin/in-target', 'in-target',
410- 'umount-chroot',
411+ ['sharepath/bin/in-target', 'in-target', 'umount-chroot',
412 '--backend=chroot', '--series=warty', '--arch=i386',
413 self.buildid], final=True)
414
415@@ -332,16 +327,14 @@
416 self.buildmanager.abort()
417 self.assertState(
418 BinaryPackageBuildState.INIT,
419- ['sharepath/slavebin/in-target', 'in-target',
420- 'scan-for-processes',
421+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
422 '--backend=chroot', '--series=warty', '--arch=i386',
423 self.buildid], final=False)
424
425 yield self.buildmanager.iterate(0)
426 self.assertState(
427 BinaryPackageBuildState.CLEANUP,
428- ['sharepath/slavebin/in-target', 'in-target',
429- 'remove-build',
430+ ['sharepath/bin/in-target', 'in-target', 'remove-build',
431 '--backend=chroot', '--series=warty', '--arch=i386',
432 self.buildid],
433 final=True)
434
435=== modified file 'lpbuildd/tests/test_debian.py'
436--- lpbuildd/tests/test_debian.py 2019-02-08 15:54:20 +0000
437+++ lpbuildd/tests/test_debian.py 2019-02-11 12:23:51 +0000
438@@ -86,7 +86,7 @@
439 self.buildmanager.initiate({}, 'chroot.tar.gz', extra_args)
440 self.assertEqual(DebianBuildState.INIT, self.getState())
441 self.assertEqual(
442- (['sharepath/slavebin/builder-prep', 'builder-prep'], None),
443+ (['sharepath/bin/builder-prep', 'builder-prep'], None),
444 self.buildmanager.commands[-1])
445 self.assertEqual(
446 self.buildmanager.iterate, self.buildmanager.iterators[-1])
447@@ -105,8 +105,7 @@
448 self.buildmanager.iterate(0)
449 self.assertEqual(DebianBuildState.UNPACK, self.getState())
450 self.assertEqual(
451- (['sharepath/slavebin/in-target', 'in-target',
452- 'unpack-chroot',
453+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
454 '--backend=chroot', '--series=xenial', '--arch=amd64',
455 self.buildid,
456 '--image-type', 'chroot',
457@@ -119,8 +118,7 @@
458 self.buildmanager.iterate(0)
459 self.assertEqual(DebianBuildState.MOUNT, self.getState())
460 self.assertEqual(
461- (['sharepath/slavebin/in-target', 'in-target',
462- 'mount-chroot',
463+ (['sharepath/bin/in-target', 'in-target', 'mount-chroot',
464 '--backend=chroot', '--series=xenial', '--arch=amd64',
465 self.buildid],
466 None),
467@@ -131,8 +129,7 @@
468 self.buildmanager.iterate(0)
469 self.assertEqual(DebianBuildState.SOURCES, self.getState())
470 self.assertEqual(
471- (['sharepath/slavebin/in-target', 'in-target',
472- 'override-sources-list',
473+ (['sharepath/bin/in-target', 'in-target', 'override-sources-list',
474 '--backend=chroot', '--series=xenial', '--arch=amd64',
475 self.buildid,
476 'deb http://ppa.launchpad.dev/owner/name/ubuntu xenial main'],
477@@ -144,8 +141,7 @@
478 self.buildmanager.iterate(0)
479 self.assertEqual(DebianBuildState.UPDATE, self.getState())
480 self.assertEqual(
481- (['sharepath/slavebin/in-target', 'in-target',
482- 'update-debian-chroot',
483+ (['sharepath/bin/in-target', 'in-target', 'update-debian-chroot',
484 '--backend=chroot', '--series=xenial', '--arch=amd64',
485 self.buildid],
486 None),
487@@ -163,8 +159,7 @@
488 self.buildmanager.iterate(0)
489 self.assertEqual(MockBuildState.MAIN, self.getState())
490 self.assertEqual(
491- (['sharepath/slavebin/in-target', 'in-target',
492- 'scan-for-processes',
493+ (['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
494 '--backend=chroot', '--series=xenial', '--arch=amd64',
495 self.buildid],
496 None),
497@@ -175,8 +170,7 @@
498 self.buildmanager.iterateReap(self.getState(), 0)
499 self.assertEqual(DebianBuildState.UMOUNT, self.getState())
500 self.assertEqual(
501- (['sharepath/slavebin/in-target', 'in-target',
502- 'umount-chroot',
503+ (['sharepath/bin/in-target', 'in-target', 'umount-chroot',
504 '--backend=chroot', '--series=xenial', '--arch=amd64',
505 self.buildid],
506 None),
507@@ -187,8 +181,7 @@
508 self.buildmanager.iterate(0)
509 self.assertEqual(DebianBuildState.CLEANUP, self.getState())
510 self.assertEqual(
511- (['sharepath/slavebin/in-target', 'in-target',
512- 'remove-build',
513+ (['sharepath/bin/in-target', 'in-target', 'remove-build',
514 '--backend=chroot', '--series=xenial', '--arch=amd64',
515 self.buildid],
516 None),
517@@ -220,8 +213,7 @@
518 self.buildmanager.iterate(0)
519 self.assertEqual(DebianBuildState.UNPACK, self.getState())
520 self.assertEqual(
521- (['sharepath/slavebin/in-target', 'in-target',
522- 'unpack-chroot',
523+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
524 '--backend=chroot', '--series=xenial', '--arch=amd64',
525 self.buildid,
526 '--image-type', 'chroot',
527@@ -234,8 +226,7 @@
528 self.buildmanager.iterate(0)
529 self.assertEqual(DebianBuildState.MOUNT, self.getState())
530 self.assertEqual(
531- (['sharepath/slavebin/in-target', 'in-target',
532- 'mount-chroot',
533+ (['sharepath/bin/in-target', 'in-target', 'mount-chroot',
534 '--backend=chroot', '--series=xenial', '--arch=amd64',
535 self.buildid],
536 None),
537@@ -246,8 +237,7 @@
538 self.buildmanager.iterate(0)
539 self.assertEqual(DebianBuildState.SOURCES, self.getState())
540 self.assertEqual(
541- (['sharepath/slavebin/in-target', 'in-target',
542- 'override-sources-list',
543+ (['sharepath/bin/in-target', 'in-target', 'override-sources-list',
544 '--backend=chroot', '--series=xenial', '--arch=amd64',
545 self.buildid,
546 'deb http://ppa.launchpad.dev/owner/name/ubuntu xenial main'],
547@@ -259,8 +249,7 @@
548 self.buildmanager.iterate(0)
549 self.assertEqual(DebianBuildState.KEYS, self.getState())
550 self.assertEqual(
551- (['sharepath/slavebin/in-target', 'in-target',
552- 'add-trusted-keys',
553+ (['sharepath/bin/in-target', 'in-target', 'add-trusted-keys',
554 '--backend=chroot', '--series=xenial', '--arch=amd64',
555 self.buildid],
556 b'key material'),
557@@ -271,8 +260,7 @@
558 self.buildmanager.iterate(0)
559 self.assertEqual(DebianBuildState.UPDATE, self.getState())
560 self.assertEqual(
561- (['sharepath/slavebin/in-target', 'in-target',
562- 'update-debian-chroot',
563+ (['sharepath/bin/in-target', 'in-target', 'update-debian-chroot',
564 '--backend=chroot', '--series=xenial', '--arch=amd64',
565 self.buildid],
566 None),
567@@ -290,8 +278,7 @@
568 self.buildmanager.iterate(0)
569 self.assertEqual(MockBuildState.MAIN, self.getState())
570 self.assertEqual(
571- (['sharepath/slavebin/in-target', 'in-target',
572- 'scan-for-processes',
573+ (['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
574 '--backend=chroot', '--series=xenial', '--arch=amd64',
575 self.buildid],
576 None),
577@@ -302,8 +289,7 @@
578 self.buildmanager.iterateReap(self.getState(), 0)
579 self.assertEqual(DebianBuildState.UMOUNT, self.getState())
580 self.assertEqual(
581- (['sharepath/slavebin/in-target', 'in-target',
582- 'umount-chroot',
583+ (['sharepath/bin/in-target', 'in-target', 'umount-chroot',
584 '--backend=chroot', '--series=xenial', '--arch=amd64',
585 self.buildid],
586 None),
587@@ -314,8 +300,7 @@
588 self.buildmanager.iterate(0)
589 self.assertEqual(DebianBuildState.CLEANUP, self.getState())
590 self.assertEqual(
591- (['sharepath/slavebin/in-target', 'in-target',
592- 'remove-build',
593+ (['sharepath/bin/in-target', 'in-target', 'remove-build',
594 '--backend=chroot', '--series=xenial', '--arch=amd64',
595 self.buildid],
596 None),
597@@ -349,8 +334,7 @@
598 self.buildmanager.iterate(0)
599 self.assertEqual(DebianBuildState.UNPACK, self.getState())
600 self.assertEqual(
601- (['sharepath/slavebin/in-target', 'in-target',
602- 'unpack-chroot',
603+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
604 '--backend=chroot', '--series=xenial', '--arch=amd64',
605 self.buildid,
606 '--image-type', 'chroot',
607@@ -363,8 +347,7 @@
608 self.buildmanager.iterate(0)
609 self.assertEqual(DebianBuildState.MOUNT, self.getState())
610 self.assertEqual(
611- (['sharepath/slavebin/in-target', 'in-target',
612- 'mount-chroot',
613+ (['sharepath/bin/in-target', 'in-target', 'mount-chroot',
614 '--backend=chroot', '--series=xenial', '--arch=amd64',
615 self.buildid],
616 None),
617@@ -375,8 +358,7 @@
618 self.buildmanager.iterate(0)
619 self.assertEqual(DebianBuildState.SOURCES, self.getState())
620 self.assertEqual(
621- (['sharepath/slavebin/in-target', 'in-target',
622- 'override-sources-list',
623+ (['sharepath/bin/in-target', 'in-target', 'override-sources-list',
624 '--backend=chroot', '--series=xenial', '--arch=amd64',
625 self.buildid,
626 'deb http://ppa.launchpad.dev/owner/name/ubuntu xenial main'],
627@@ -388,8 +370,7 @@
628 self.buildmanager.iterate(0)
629 self.assertEqual(DebianBuildState.UPDATE, self.getState())
630 self.assertEqual(
631- (['sharepath/slavebin/in-target', 'in-target',
632- 'update-debian-chroot',
633+ (['sharepath/bin/in-target', 'in-target', 'update-debian-chroot',
634 '--backend=chroot', '--series=xenial', '--arch=amd64',
635 self.buildid],
636 None),
637@@ -407,8 +388,7 @@
638 self.buildmanager.iterate(0)
639 self.assertEqual(MockBuildState.MAIN, self.getState())
640 self.assertEqual(
641- (['sharepath/slavebin/in-target', 'in-target',
642- 'scan-for-processes',
643+ (['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
644 '--backend=chroot', '--series=xenial', '--arch=amd64',
645 self.buildid],
646 None),
647@@ -438,8 +418,7 @@
648 self.buildmanager.iterate(0)
649 self.assertEqual(DebianBuildState.UNPACK, self.getState())
650 self.assertEqual(
651- (['sharepath/slavebin/in-target', 'in-target',
652- 'unpack-chroot',
653+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
654 '--backend=lxd', '--series=xenial', '--arch=amd64',
655 self.buildid,
656 '--image-type', 'lxd',
657
658=== modified file 'lpbuildd/tests/test_livefs.py'
659--- lpbuildd/tests/test_livefs.py 2018-10-05 15:43:40 +0000
660+++ lpbuildd/tests/test_livefs.py 2019-02-11 12:23:51 +0000
661@@ -81,8 +81,7 @@
662 self.assertEqual(
663 LiveFilesystemBuildState.BUILD_LIVEFS, self.getState())
664 expected_command = [
665- "sharepath/slavebin/in-target", "in-target",
666- "buildlivefs",
667+ "sharepath/bin/in-target", "in-target", "buildlivefs",
668 "--backend=lxd", "--series=saucy", "--arch=i386", self.buildid,
669 "--project", "ubuntu",
670 ]
671@@ -106,8 +105,7 @@
672 # After building the package, reap processes.
673 yield self.buildmanager.iterate(0)
674 expected_command = [
675- "sharepath/slavebin/in-target", "in-target",
676- "scan-for-processes",
677+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
678 "--backend=lxd", "--series=saucy", "--arch=i386", self.buildid,
679 ]
680 self.assertEqual(
681@@ -123,8 +121,7 @@
682 # Control returns to the DebianBuildManager in the UMOUNT state.
683 self.buildmanager.iterateReap(self.getState(), 0)
684 expected_command = [
685- "sharepath/slavebin/in-target", "in-target",
686- "umount-chroot",
687+ "sharepath/bin/in-target", "in-target", "umount-chroot",
688 "--backend=lxd", "--series=saucy", "--arch=i386", self.buildid,
689 ]
690 self.assertEqual(LiveFilesystemBuildState.UMOUNT, self.getState())
691
692=== modified file 'lpbuildd/tests/test_snap.py'
693--- lpbuildd/tests/test_snap.py 2018-10-05 15:43:40 +0000
694+++ lpbuildd/tests/test_snap.py 2019-02-11 12:23:51 +0000
695@@ -96,8 +96,7 @@
696 yield self.buildmanager.iterate(0)
697 self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
698 expected_command = [
699- "sharepath/slavebin/in-target", "in-target",
700- "buildsnap",
701+ "sharepath/bin/in-target", "in-target", "buildsnap",
702 "--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
703 "--git-repository", "https://git.launchpad.dev/~example/+git/snap",
704 "--git-path", "master",
705@@ -135,8 +134,7 @@
706 # After building the package, reap processes.
707 yield self.buildmanager.iterate(0)
708 expected_command = [
709- "sharepath/slavebin/in-target", "in-target",
710- "scan-for-processes",
711+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
712 "--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
713 ]
714 self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
715@@ -151,8 +149,7 @@
716 # Control returns to the DebianBuildManager in the UMOUNT state.
717 self.buildmanager.iterateReap(self.getState(), 0)
718 expected_command = [
719- "sharepath/slavebin/in-target", "in-target",
720- "umount-chroot",
721+ "sharepath/bin/in-target", "in-target", "umount-chroot",
722 "--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
723 ]
724 self.assertEqual(SnapBuildState.UMOUNT, self.getState())
725@@ -179,8 +176,7 @@
726 # After building the package, reap processes.
727 yield self.buildmanager.iterate(0)
728 expected_command = [
729- "sharepath/slavebin/in-target", "in-target",
730- "scan-for-processes",
731+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
732 "--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
733 ]
734 self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
735@@ -196,8 +192,7 @@
736 # Control returns to the DebianBuildManager in the UMOUNT state.
737 self.buildmanager.iterateReap(self.getState(), 0)
738 expected_command = [
739- "sharepath/slavebin/in-target", "in-target",
740- "umount-chroot",
741+ "sharepath/bin/in-target", "in-target", "umount-chroot",
742 "--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
743 ]
744 self.assertEqual(SnapBuildState.UMOUNT, self.getState())
745@@ -225,8 +220,7 @@
746 # After building the package, reap processes.
747 yield self.buildmanager.iterate(0)
748 expected_command = [
749- "sharepath/slavebin/in-target", "in-target",
750- "scan-for-processes",
751+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
752 "--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
753 ]
754 self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
755@@ -242,8 +236,7 @@
756 # Control returns to the DebianBuildManager in the UMOUNT state.
757 self.buildmanager.iterateReap(self.getState(), 0)
758 expected_command = [
759- "sharepath/slavebin/in-target", "in-target",
760- "umount-chroot",
761+ "sharepath/bin/in-target", "in-target", "umount-chroot",
762 "--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
763 ]
764 self.assertEqual(SnapBuildState.UMOUNT, self.getState())
765
766=== modified file 'lpbuildd/tests/test_sourcepackagerecipe.py'
767--- lpbuildd/tests/test_sourcepackagerecipe.py 2018-10-05 15:43:40 +0000
768+++ lpbuildd/tests/test_sourcepackagerecipe.py 2019-02-11 12:23:51 +0000
769@@ -93,8 +93,7 @@
770 yield self.buildmanager.iterate(0)
771 self.assertEqual(
772 SourcePackageRecipeBuildState.BUILD_RECIPE, self.getState())
773- expected_command = [
774- 'sharepath/slavebin/buildrecipe', 'buildrecipe']
775+ expected_command = ['sharepath/bin/buildrecipe', 'buildrecipe']
776 if git:
777 expected_command.append('--git')
778 expected_command.extend([
779@@ -130,8 +129,7 @@
780 # After building the package, reap processes.
781 yield self.buildmanager.iterate(0)
782 expected_command = [
783- 'sharepath/slavebin/in-target', 'in-target',
784- 'scan-for-processes',
785+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
786 '--backend=chroot', '--series=maverick', '--arch=i386',
787 self.buildid,
788 ]
789@@ -149,8 +147,7 @@
790 # Control returns to the DebianBuildManager in the UMOUNT state.
791 self.buildmanager.iterateReap(self.getState(), 0)
792 expected_command = [
793- 'sharepath/slavebin/in-target', 'in-target',
794- 'umount-chroot',
795+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
796 '--backend=chroot', '--series=maverick', '--arch=i386',
797 self.buildid,
798 ]
799@@ -176,8 +173,7 @@
800 # The buildmanager calls depFail correctly and reaps processes.
801 yield self.buildmanager.iterate(RETCODE_FAILURE_INSTALL_BUILD_DEPS)
802 expected_command = [
803- 'sharepath/slavebin/in-target', 'in-target',
804- 'scan-for-processes',
805+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
806 '--backend=chroot', '--series=maverick', '--arch=i386',
807 self.buildid,
808 ]
809@@ -193,8 +189,7 @@
810 # Control returns to the DebianBuildManager in the UMOUNT state.
811 self.buildmanager.iterateReap(self.getState(), 0)
812 expected_command = [
813- 'sharepath/slavebin/in-target', 'in-target',
814- 'umount-chroot',
815+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
816 '--backend=chroot', '--series=maverick', '--arch=i386',
817 self.buildid,
818 ]
819@@ -217,8 +212,7 @@
820 # The buildmanager calls buildFail correctly and reaps processes.
821 yield self.buildmanager.iterate(RETCODE_FAILURE_INSTALL_BUILD_DEPS)
822 expected_command = [
823- 'sharepath/slavebin/in-target', 'in-target',
824- 'scan-for-processes',
825+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
826 '--backend=chroot', '--series=maverick', '--arch=i386',
827 self.buildid,
828 ]
829@@ -233,8 +227,7 @@
830 # Control returns to the DebianBuildManager in the UMOUNT state.
831 self.buildmanager.iterateReap(self.getState(), 0)
832 expected_command = [
833- 'sharepath/slavebin/in-target', 'in-target',
834- 'umount-chroot',
835+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
836 '--backend=chroot', '--series=maverick', '--arch=i386',
837 self.buildid,
838 ]
839
840=== modified file 'lpbuildd/tests/test_translationtemplatesbuildmanager.py'
841--- lpbuildd/tests/test_translationtemplatesbuildmanager.py 2018-10-05 15:43:40 +0000
842+++ lpbuildd/tests/test_translationtemplatesbuildmanager.py 2019-02-11 12:23:51 +0000
843@@ -84,7 +84,7 @@
844 self.assertEqual(
845 TranslationTemplatesBuildState.GENERATE, self.getState())
846 expected_command = [
847- 'sharepath/slavebin/in-target', 'in-target',
848+ 'sharepath/bin/in-target', 'in-target',
849 'generate-translation-templates',
850 '--backend=chroot', '--series=xenial', '--arch=i386',
851 self.buildid,
852@@ -103,8 +103,7 @@
853 # After generating templates, reap processes.
854 yield self.buildmanager.iterate(0)
855 expected_command = [
856- 'sharepath/slavebin/in-target', 'in-target',
857- 'scan-for-processes',
858+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
859 '--backend=chroot', '--series=xenial', '--arch=i386',
860 self.buildid,
861 ]
862@@ -122,8 +121,7 @@
863 # The control returns to the DebianBuildManager in the UMOUNT state.
864 self.buildmanager.iterateReap(self.getState(), 0)
865 expected_command = [
866- 'sharepath/slavebin/in-target', 'in-target',
867- 'umount-chroot',
868+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
869 '--backend=chroot', '--series=xenial', '--arch=i386',
870 self.buildid,
871 ]
872@@ -152,8 +150,7 @@
873 self.assertEqual(
874 TranslationTemplatesBuildState.GENERATE, self.getState())
875 expected_command = [
876- 'sharepath/slavebin/in-target', 'in-target',
877- 'scan-for-processes',
878+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
879 '--backend=chroot', '--series=xenial', '--arch=i386',
880 self.buildid,
881 ]
882@@ -167,8 +164,7 @@
883 self.assertEqual(
884 TranslationTemplatesBuildState.UMOUNT, self.getState())
885 expected_command = [
886- 'sharepath/slavebin/in-target', 'in-target',
887- 'umount-chroot',
888+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
889 '--backend=chroot', '--series=xenial', '--arch=i386',
890 self.buildid,
891 ]
892@@ -192,8 +188,7 @@
893 # The buildmanager fails and reaps processes.
894 yield self.buildmanager.iterate(RETCODE_FAILURE_BUILD)
895 expected_command = [
896- 'sharepath/slavebin/in-target', 'in-target',
897- 'scan-for-processes',
898+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
899 '--backend=chroot', '--series=xenial', '--arch=i386',
900 self.buildid,
901 ]
902@@ -209,8 +204,7 @@
903 self.assertEqual(
904 TranslationTemplatesBuildState.UMOUNT, self.getState())
905 expected_command = [
906- 'sharepath/slavebin/in-target', 'in-target',
907- 'umount-chroot',
908+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
909 '--backend=chroot', '--series=xenial', '--arch=i386',
910 self.buildid,
911 ]

Subscribers

People subscribed via source and target branches

to all changes: