From f8eef1d16a7686b5dc54eb8b248b669b30ca1ba3 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Wed, 29 Apr 2020 19:31:30 +1200
Subject: [PATCH] fix Subiquity.restart dry-run path now we actually hit that
 in runtests.sh

---
 scripts/runtests.sh | 2 +-
 subiquity/core.py   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/runtests.sh b/scripts/runtests.sh
index a5b4bd55..0f7dc6c8 100755
--- a/scripts/runtests.sh
+++ b/scripts/runtests.sh
@@ -18,7 +18,7 @@ validate () {
 clean () {
     rm -f .subiquity/subiquity-curtin-install.conf
     rm -f .subiquity/subiquity-debug.log
-    rm -f .subiquity/run/subiquity/updating
+    rm -rf .subiquity/run/
 }
 
 export SUBIQUITY_REPLAY_TIMESCALE=100
diff --git a/subiquity/core.py b/subiquity/core.py
index a2553503..67903c68 100644
--- a/subiquity/core.py
+++ b/subiquity/core.py
@@ -158,7 +158,9 @@ class Subiquity(Application):
         self.urwid_loop.screen.stop()
         cmdline = ['snap', 'run', 'subiquity']
         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)
 
     def make_screen(self, input=None, output=None):