test scripts don't support unshelve
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
Vincent Ladeuil |
Bug Description
While investigating bug #850594 I tried writing the corresponding test-script:
$ bzr init .
$ mkdir dir/
$ echo "this line represents editing" >> dir/file
$ bzr add
$ bzr shelve -m "work on file" dir/file
# Shelve adding file "dir/file"? [yNfq?] y
# Shelve adding file "dir"? [yNfq?] n
# Selected changes:
# -D dir/file
# Shelve 1 change(s)? [yNfq?] y
<yny
$ bzr ci -m "setup dir"
$ bzr unshelve
Trying it with './bzr test-script --null-output bug.script' fails with:
FAIL: bzrlib.
log: {{{
0.131 creating repository in file://
0.134 creating branch <bzrlib.
0.141 trying to create missing lock '/tmp/testbzr-
0.142 opening working tree '/tmp/testbzr-
0.149 run bzr: ['init', '.']
0.149 bazaar version: 2.5.0dev2
0.149 bzr arguments: [u'init', u'.']
0.151 encoding stdout as sys.stdout encoding 'UTF-8'
0.154 creating repository in file://
0.157 creating branch <bzrlib.
0.161 trying to create missing lock '/tmp/testbzr-
0.161 opening working tree '/tmp/testbzr-
0.166 opening working tree '/tmp/testbzr-
0.181 output:
'Created a standalone tree (format: 2a)\n'
0.181 run bzr: ['add']
0.181 bazaar version: 2.5.0dev2
0.181 bzr arguments: [u'add']
0.183 encoding stdout as sys.stdout encoding 'UTF-8'
0.185 opening working tree '/tmp/testbzr-
0.189 skip control directory '.bzr'
0.190 creating config directory: '/tmp/testbzr-
0.194 output:
'adding dir\nadding dir/file\n'
0.195 run bzr: ['shelve', '-m', 'work on file', 'dir/file']
0.195 bazaar version: 2.5.0dev2
0.195 bzr arguments: [u'shelve', u'-m', u'work on file', u'dir/file']
0.196 encoding stdout as sys.stdout encoding 'UTF-8'
0.199 opening working tree '/tmp/testbzr-
0.204 Traceback (most recent call last):
File "/home/
return run_bzr(argv)
File "/home/
ret = run(*run_argv)
File "/home/
return self.run(
File "/home/
return self._operation
File "/home/
self.cleanups, self.func, *args, **kwargs)
File "/home/
result = func(*args, **kwargs)
File "/home/
shelver.run()
File "/home/
if self.prompt_
File "/home/
char = self.prompt(
File "/home/
raise errors.
BzrError: You need a controlling terminal.
0.204 errors:
'bzr: ERROR: You need a controlling terminal.\n'
}}}
Related branches
- Martin Packman (community): Needs Fixing
- Vincent Ladeuil: Needs Information
-
Diff: 182 lines (+97/-7)4 files modifiedbzrlib/shelf_ui.py (+26/-4)
bzrlib/tests/script.py (+8/-0)
bzrlib/tests/test_script.py (+56/-3)
doc/en/release-notes/bzr-2.5.txt (+7/-0)
Changed in bzr: | |
assignee: | nobody → Vincent Ladeuil (vila) |
status: | Confirmed → In Progress |
Changed in bzr: | |
milestone: | none → 2.5b2 |
status: | In Progress → Fix Released |