fix Subiquity.restart dry-run path now we actually hit that in runtests.sh

This commit is contained in:
Michael Hudson-Doyle 2020-04-29 19:31:30 +12:00
parent 05ca96d7ba
commit f8eef1d16a
2 changed files with 4 additions and 2 deletions

View File

@ -18,7 +18,7 @@ validate () {
clean () { clean () {
rm -f .subiquity/subiquity-curtin-install.conf rm -f .subiquity/subiquity-curtin-install.conf
rm -f .subiquity/subiquity-debug.log rm -f .subiquity/subiquity-debug.log
rm -f .subiquity/run/subiquity/updating rm -rf .subiquity/run/
} }
export SUBIQUITY_REPLAY_TIMESCALE=100 export SUBIQUITY_REPLAY_TIMESCALE=100

View File

@ -158,7 +158,9 @@ class Subiquity(Application):
self.urwid_loop.screen.stop() self.urwid_loop.screen.stop()
cmdline = ['snap', 'run', 'subiquity'] cmdline = ['snap', 'run', 'subiquity']
if self.opts.dry_run: if self.opts.dry_run:
cmdline = [sys.executable] + sys.argv cmdline = [
sys.executable, '-m', 'subiquity.cmd.tui',
] + sys.argv[1:]
os.execvp(cmdline[0], cmdline) os.execvp(cmdline[0], cmdline)
def make_screen(self, input=None, output=None): def make_screen(self, input=None, output=None):