Tweak the flow of questions a bit

3 files changed, 21 insertions, 6 deletions

diff --git a/tests/xdg-utils-usecases/t.10-file_icon b/tests/xdg-utils-usecases/t.10-file_icon
index 1886e2f..2f6e5c3 100755
--- a/tests/xdg-utils-usecases/t.10-file_icon
+++ b/tests/xdg-utils-usecases/t.10-file_icon
@@ -47,6 +47,7 @@ if [ `whoami` != 'root' ] ; then
 	assert_exit 0 xdg-open "$TEST_DIR"
 	assert_nostdout
 	assert_nostderr
+	assert_interactive "Did the file browser open the '$TEST_DIR' directory?" y
 else
 	assert_interactive "Please open '$TEST_DIR' in the file browser."
 fi
@@ -54,10 +55,14 @@ fi
 # ask user to cycle through sizes & ensure correct icons are displayed.
 assert_interactive "Is a file named '$TEST_FILE' present in the directory?" y
 assert_interactive "Does the icon consist of a red number in the list {$ICON_SIZES}?\n\tThe number should roughly correspond to the icon size.\n\t(You may need to select something like 'View->As Icons')" y
-assert_interactive "Does the number change appropriately when you increase or decrease the view size?" y
+# assert_interactive "Does the number change appropriately when you increase or decrease the view size?" y
 
 ## cleanup
-assert_interactive "Please close any windows opened by this test." C
+if [ `whoami` != 'root' ] ; then
+	assert_interactive "Please close any windows opened by this test." C
+else
+	assert_interactive "You may close the file browser window." C
+fi
 
 # remove icons
 for i in $ICON_SIZES; do
diff --git a/tests/xdg-utils-usecases/t.11-desktop_file_icon b/tests/xdg-utils-usecases/t.11-desktop_file_icon
index e742cda..2f98893 100755
--- a/tests/xdg-utils-usecases/t.11-desktop_file_icon
+++ b/tests/xdg-utils-usecases/t.11-desktop_file_icon
@@ -38,6 +38,7 @@ if [ `whoami` != 'root' ] ; then
 	assert_exit 0 xdg-open "$TEST_DIR"
 	assert_nostdout
 	assert_nostderr
+	assert_interactive "Did the file browser open the '$TEST_DIR' directory?" y
 else
 	assert_interactive "Please open '$TEST_DIR' in the file browser."
 fi
@@ -45,10 +46,14 @@ fi
 # ask user to cycle through sizes & ensure correct icons are displayed.
 assert_interactive "Is a file named 'Icon Test' present in the directory?" y
 assert_interactive "Does the icon consist of a red number in the list {$ICON_SIZES}?\n\tThe number should roughly correspond to the icon size.\n\t(You may need to select something like 'View->As Icons')" y
-assert_interactive "Does the number change appropriately when you increase or decrease the view size?" y
+# assert_interactive "Does the number change appropriately when you increase or decrease the view size?" y
 
 ## cleanup
-assert_interactive "Please close any windows opened by this test." C
+if [ `whoami` != 'root' ] ; then
+	assert_interactive "Please close any windows opened by this test." C
+else
+	assert_interactive "You may close the file browser window." C
+fi
 
 # remove icons
 for i in $ICON_SIZES; do
diff --git a/tests/xdg-utils-usecases/t.12-svg_icon_render b/tests/xdg-utils-usecases/t.12-svg_icon_render
index f342fef..40b4515 100755
--- a/tests/xdg-utils-usecases/t.12-svg_icon_render
+++ b/tests/xdg-utils-usecases/t.12-svg_icon_render
@@ -35,6 +35,7 @@ if [ `whoami` != 'root' ] ; then
 	assert_exit 0 xdg-open "$TEST_DIR"
 	assert_nostdout
 	assert_nostderr
+	assert_interactive "Did the file browser open the '$TEST_DIR' directory?" y
 else
 	assert_interactive "Please open '$TEST_DIR' in the file browser."
 fi
@@ -42,10 +43,14 @@ fi
 # ask user to cycle through sizes & ensure correct icons are displayed.
 assert_interactive "Is a file named 'Icon Test' present in the directory?" y
 assert_interactive "Does the icon consist of the red text 'SVG'?\n\t(You may need to select something like 'View->As Icons')" y
-assert_interactive "Does the text change size appropriately when the display size is changed?" y
+# assert_interactive "Does the text change size appropriately when the display size is changed?" y
 
 ## cleanup
-assert_interactive "Please close any windows opened by this test." C
+if [ `whoami` != 'root' ] ; then
+	assert_interactive "Please close any windows opened by this test." C
+else
+	assert_interactive "You may close the file browser window." C
+fi
 
 # remove icons
 assert_exit 0 xdg-icon-resource uninstall  "$ICON_NAME.svg"