3503

Undo commit 3500; turns out we need the duplicate scenario names for
good test failure messages.

3 files changed, 11 insertions, 11 deletions

diff --git a/082scenario_screen.cc b/082scenario_screen.cc
index 84072d86..56e3ab6b 100644
--- a/082scenario_screen.cc
+++ b/082scenario_screen.cc
@@ -11,7 +11,7 @@ recipes_taking_literal_strings.insert("screen-should-contain-in-color");
 
 :(scenarios run_mu_scenario)
 :(scenario screen_in_scenario)
-scenario foo [
+scenario screen-in-scenario [
   local-scope
   assume-screen 5/width, 3/height
   run [
@@ -29,7 +29,7 @@ scenario foo [
 
 :(scenario screen_in_scenario_unicode)
 # screen-should-contain can check unicode characters in the fake screen
-scenario foo [
+scenario screen-in-scenario-unicode [
   local-scope
   assume-screen 5/width, 3/height
   run [
@@ -48,7 +48,7 @@ scenario foo [
 # checks are inside scenario
 
 :(scenario screen_in_scenario_color)
-scenario foo [
+scenario screen-in-scenario-color [
   local-scope
   assume-screen 5/width, 3/height
   run [
@@ -85,7 +85,7 @@ scenario foo [
 :(scenario screen_in_scenario_error)
 % Scenario_testing_scenario = true;
 % Hide_errors = true;
-scenario foo [
+scenario screen-in-scenario-error [
   local-scope
   assume-screen 5/width, 3/height
   run [
@@ -105,7 +105,7 @@ scenario foo [
 % Scenario_testing_scenario = true;
 % Hide_errors = true;
 # screen-should-contain can check unicode characters in the fake screen
-scenario foo [
+scenario screen-in-scenario-color-error [
   local-scope
   assume-screen 5/width, 3/height
   run [
@@ -175,10 +175,10 @@ if (curr.name == "assume-screen") {
 
 :(scenario assume_screen_shows_up_in_errors)
 % Hide_errors = true;
-scenario foo [
+scenario assume-screen-shows-up-in-errors [
   assume-screen width, 5
 ]
-+error: scenario_foo: missing type for 'width' in 'assume-screen width, 5'
++error: scenario_assume-screen-shows-up-in-errors: missing type for 'width' in 'assume-screen width, 5'
 
 //: screen-should-contain is a regular instruction
 :(before "End Primitive Recipe Declarations")
diff --git a/085scenario_console.cc b/085scenario_console.cc
index 24ffebed..dde46134 100644
--- a/085scenario_console.cc
+++ b/085scenario_console.cc
@@ -10,7 +10,7 @@ recipes_taking_literal_strings.insert("assume-console");
 
 :(scenarios run_mu_scenario)
 :(scenario keyboard_in_scenario)
-scenario foo [
+scenario keyboard-in-scenario [
   assume-console [
     type [abc]
   ]
@@ -202,7 +202,7 @@ void initialize_special_name(reagent& r) {
 }
 
 :(scenario events_in_scenario)
-scenario foo [
+scenario events-in-scenario [
   assume-console [
     type [abc]
     left-click 0, 1
diff --git a/089scenario_filesystem.cc b/089scenario_filesystem.cc
index 078757a5..95880cce 100644
--- a/089scenario_filesystem.cc
+++ b/089scenario_filesystem.cc
@@ -6,7 +6,7 @@
 
 :(scenarios run_mu_scenario)
 :(scenario simple_filesystem)
-scenario foo [
+scenario simple-filesystem [
   local-scope
   assume-filesystem [
     # file 'a' containing two lines of data
@@ -50,7 +50,7 @@ de f
 ]
 
 :(scenario escaping_file_contents)
-scenario foo [
+scenario escaping-file-contents [
   local-scope
   assume-filesystem [
     # file 'a' containing a '|'