# HG changeset patch
# User Maciej Seroka <maciejs@symbian.org>
# Date 1284132805 -3600
# Node ID 6b9970ac90ac6658e818d76e2566276d06c90286
# Parent  4c7b457173b42561656400bdb5c40ab781f2aa43
Updated iby files for Appinstall and Contacts smoke tests

diff -r 4c7b457173b4 -r 6b9970ac90ac Group/ats4_smoketest_syborg.xml
--- a/Group/ats4_smoketest_syborg.xml	Fri Sep 03 09:14:52 2010 +0100
+++ b/Group/ats4_smoketest_syborg.xml	Fri Sep 10 16:33:25 2010 +0100
@@ -195,6 +195,7 @@
 				<parameter name="timeout" value="1200" />
 			</parameters>
 		</task>
+<!-- Http test hangs due to ethernet not configured
 		<task agents="target">
 			<type>NonTestExecuteTask</type>
 			<parameters>
@@ -214,6 +215,7 @@
 				<parameter name="timeout" value="1200" />
 			</parameters>
 		</task>
+-->
 		<task agents="target">
 			<type>ExecutableTestCaseTask</type>
 			<parameters>
@@ -231,7 +233,7 @@
 				<parameter name="parameters" value="-testmodule testcombiner -config z:\smoketest\smoketest_notepad.cfg" />
 				<parameter name="parser" value="STIFXMLParser" />
 				<parameter name="result-file" value="c:\spd_logs\xml\testcombiner.xml" />
-				<parameter name="timeout" value="1200" />
+				<parameter name="timeout" value="3600" />
 			</parameters>
 		</task>
 		<task agents="target">
diff -r 4c7b457173b4 -r 6b9970ac90ac Group/smoketest_syborg.xml
--- a/Group/smoketest_syborg.xml	Fri Sep 03 09:14:52 2010 +0100
+++ b/Group/smoketest_syborg.xml	Fri Sep 10 16:33:25 2010 +0100
@@ -36,10 +36,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_apploader.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_apploader.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_apploader (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -58,10 +55,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_agenda.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_agenda.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_agenda (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -80,10 +74,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_contacts.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_contacts.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_contacts (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -102,10 +93,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_mess.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_mess.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_mess (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -124,10 +112,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_timew.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_timew.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_timew (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -146,10 +131,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_email.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_email.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_email (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -168,10 +150,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_lbs.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_lbs.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_lbs (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -190,10 +169,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_language.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_language.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_language (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -212,10 +188,7 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_bitmap.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_bitmap.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
 					<step id="" name="smoketest_bitmap (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
@@ -234,13 +207,10 @@
 						<params>
 							<param file="testexecute.exe" />
 							<param parameters="z:\smoketest\setup_smoketest_http.script" />
-							<param result-file="c:\logs\testexecute\setup_smoketest_http.htm" />
 							<param timeout="1200" />
-							<param parser="TEFTestResultParser" />
-							<param leave-old-result="true" />
 						</params>
 					</step>
-					<step id="" name="smoketest_http (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
+					<step id="" name="smoketest_http (execute)" harness="GENERIC" enabled="false" passrate="100" significant="true">
 						<command>execute</command>
 						<params>
 							<param file="testexecute.exe"/>
@@ -284,7 +254,7 @@
 							<param leave-old-result="true"/>
 						</params>
 					</step>
-					<step id="" name="screen.mbm (fetch-log)" harness="GENERIC" enabled="false" passrate="100">
+					<step id="" name="screen.mbm (fetch-log)" harness="GENERIC" enabled="true" passrate="100">
 						<command>fetch-log</command>
 						<params>
 							<param path="c:\logs\testexecute\screen.mbm" /> 
diff -r 4c7b457173b4 -r 6b9970ac90ac appinstall/conf/AppInstallSmokeTestModule_z.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall/conf/AppInstallSmokeTestModule_z.cfg	Fri Sep 10 16:33:25 2010 +0100
@@ -0,0 +1,15 @@
+[Test]
+title Install Application
+create AppInstallSmokeTestModule installer
+installer InstallApp z:\smoketest\appinstall\sistest_winscw.sisx
+delete installer
+[Endtest]
+
+[Test]
+title Uninstall Application
+create AppInstallSmokeTestModule uninstaller
+uninstaller UninstallApp E4F8641B
+delete uninstaller
+[Endtest]
+
+
diff -r 4c7b457173b4 -r 6b9970ac90ac appinstall/group/Smoketest_AppInstall.iby
--- a/appinstall/group/Smoketest_AppInstall.iby	Fri Sep 03 09:14:52 2010 +0100
+++ b/appinstall/group/Smoketest_AppInstall.iby	Fri Sep 10 16:33:25 2010 +0100
@@ -4,5 +4,6 @@
 
 file=ABI_DIR\DEBUG_DIR\AppInstallSmokeTestModule.dll    System\libs\AppInstallSmokeTestModule.dll
 data=EPOCROOT##epoc32\data\c\smoketest\AppInstallSmokeTestModule.cfg	      smoketest\AppInstallSmokeTestModule.cfg
+data=EPOCROOT##epoc32\data\c\smoketest\Appinstall\sistest_winscw.sisx	      smoketest\Appinstall\sistest_winscw.sisx
 
 #endif //SMOKETEST_APPINSTALL_IBY
diff -r 4c7b457173b4 -r 6b9970ac90ac contacts/group/Smoketest_Contacts.iby
--- a/contacts/group/Smoketest_Contacts.iby	Fri Sep 03 09:14:52 2010 +0100
+++ b/contacts/group/Smoketest_Contacts.iby	Fri Sep 10 16:33:25 2010 +0100
@@ -2,7 +2,7 @@
 #define SMOKETEST_CONTACTS_IBY
 
 
-file=ABI_DIR\DEBUG_DIR\Smoketest_Contacts.exe    System\libs\Smoketest_Contacts.exe
+file=ABI_DIR\DEBUG_DIR\Smoketest_Contacts_Server.exe    System\libs\Smoketest_Contacts_Server.exe
 
 data=EPOCROOT##epoc32\data\z\smoketest\setup_Smoketest_Contacts.script 	      smoketest\setup_Smoketest_Contacts.script 
 data=EPOCROOT##epoc32\data\z\smoketest\Smoketest_Contacts.script 	      smoketest\Smoketest_Contacts.script