diff -r be27ed110b50 -r e1eecf4d390d sbsv2/raptor/test/smoke_suite/timeout.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/timeout.py	Mon Nov 16 09:46:46 2009 +0000
@@ -0,0 +1,57 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
+from raptor_tests import SmokeTest
+import os
+
+def run():
+	t = SmokeTest()
+	t.description = "test that long commands time out and get retried"
+	
+	exitCode = "15"
+	if t.onWindows:
+		exitCode = "128" # why are they different?
+
+	t.id = "60a"
+	t.name = "timeout"
+	t.usebash = True
+	t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -f-"
+
+	t.mustmatch = [
+		"status exit='failed' code='" + exitCode + "' attempt='1'",
+	]
+	t.errors = -1
+	t.returncode = 1
+	t.run()
+	
+	t.id = "60b"
+	t.name = "timeout with retries"
+	t.usebash = True
+	t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -t 3 -f-"
+
+	t.mustmatch = [
+		"status exit='retry' code='" + exitCode + "' attempt='1'",
+		"status exit='retry' code='" + exitCode + "' attempt='2'",
+		"status exit='failed' code='" + exitCode + "' attempt='3'",
+	]
+	t.errors = -1
+	t.returncode = 1
+	t.run()
+	
+	t.id = "60"
+	t.name = "timeout"
+	t.print_result()
+	return t