diff -r 7d4490026038 -r 44f437012c90 persistentstorage/centralrepository/test/t_cenrep_rfs.cpp --- a/persistentstorage/centralrepository/test/t_cenrep_rfs.cpp Mon Sep 27 11:59:56 2010 +0100 +++ b/persistentstorage/centralrepository/test/t_cenrep_rfs.cpp Tue Oct 19 16:26:13 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -85,6 +85,13 @@ User::After(KGeneralDelay); } +LOCAL_C void KillCentrepExe() + { + _LIT( KCentralRepositoryServerName, "Centralrepositorysrv"); + KillProcess(KCentralRepositoryServerName); // Don't need to check the return code, it always return KErrNone anyway. + User::After(KGeneralDelay); + } + //This function restores the state of the files required for this test //Existing files are deleted and then the required files are copied //back from the Z drive to the c drive @@ -182,7 +189,7 @@ LOCAL_C void RestoreFactorySettingsTestL() { - TheTest.Start(_L("ResetAllRepositoriesTestL")); + TheTest.Start(_L("RestoreFactorySettingsTestL")); TInt r; TInt i; TBuf<20> str; @@ -249,7 +256,6 @@ } - /** @SYMTestCaseID SYSLIB-CENTRALREPOSITORY-CT-3341 @SYMTestCaseDesc Restore factory Settings from Rom file. @@ -634,6 +640,7 @@ TheTest.Start(_L(" @SYMTestCaseID:SYSLIB-CENTRALREPOSITORY-CT-0497-0001 Restore Factory Settings tests ")); CleanupCDriveL(); KillC32Exe(); //Need to kill C32Exe as it is interfering with the test. + KillCentrepExe(); RestoreFactorySettingsTestL(); PDEF105203(); RFSRomOnlyL();