[Jive-Checkins] r2330 - in /7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke: ChoosePlayer.bmp ChoosePlayerMacro.lua ChoosePlayer_fail.bmp Macros.lua SoftwareUpgradeMacro.lua

[titmuss]

Author: titmuss
Date: Thu Apr 24 03:29:49 2008
New Revision: 2330

URL: http://svn.slimdevices.com?rev=2330&root=Jive&view=rev
Log:
Bug: N/A
Description:
Tweaks to allow the SoftwareUpgrade and Playmode applets run automatically.


Removed:
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayer.bmp
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayerMacro.lua
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayer_fail.bmp
Modified:
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua
    
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua

Modified: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua?rev=2330&root=Jive&r1=2329&r2=2330&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua Thu Apr 24 
03:29:49 2008
@@ -1,8 +1,7 @@
 return {
-  auto=false,
-  autostart={ "playmode" },
+  auto=1,
+  autostart={ "softwareUpgrade", "playmode" },
   macros={
-    chooseplayer={ desc="Choose Player Macro", file="ChoosePlayerMacro.lua", 
name="Choose Player" },
     playmode={
       desc="Playmode tests (stop/pause/play).",
       file="PlaymodeMacro.lua",
@@ -10,7 +9,6 @@
     },
     softwareUpgrade={
       desc="User requested software upgrade.",
-      failed="Thu Apr 24 11:05:36 2008",
       file="SoftwareUpgradeMacro.lua",
       name="Software Upgrade" 
     } 

Modified: 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua?rev=2330&root=Jive&r1=2329&r2=2330&view=diff
==============================================================================
--- 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua 
(original)
+++ 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua 
Thu Apr 24 03:29:49 2008
@@ -47,3 +47,8 @@
 end
 
 macroPass("SoftwareUpgrade")
+
+-- 5 minute delay to allow upgrade to complete, this is never expected
+-- to return
+macroDelay(300000)
+macroFail("Timeout")

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins