diff -r f18401adf8e1 -r 641f389e9157 authorisation/userpromptservice/test/tups/src/tupsclientstep.cpp --- a/authorisation/userpromptservice/test/tups/src/tupsclientstep.cpp Thu Aug 19 11:38:48 2010 +0300 +++ b/authorisation/userpromptservice/test/tups/src/tupsclientstep.cpp Tue Aug 31 17:00:08 2010 +0300 @@ -406,13 +406,6 @@ INFO_PRINTF3(_L("%S :Closing session to server: %S"),&iTEFServerName, &iArraySersToRequest[index].iServerName ); CloseSessionL(iArraySersToRequest[index].iServerName); } - - // If it needs to wait for file installation (via swi) - if(iArraySersToRequest[index].iWaitUntilFileAppears.CompareF(_L(""))!=0) - { - WaitThatFileAppearsL(iArraySersToRequest[index].iWaitUntilFileAppears); - INFO_PRINTF3(_L("%S :File installed by SWI found: %S"),&iTEFServerName,&iArraySersToRequest[index].iWaitUntilFileAppears); - } } // End of second loop }// End of first loop @@ -857,45 +850,3 @@ return checkPassed; } // End of function. - - -void CUpsClientStep::WaitThatFileAppearsL(const TDesC& aFileName) - { - RFs aFs; - aFs.Connect(); - - RProperty checkSwiState; - - User::LeaveIfError(checkSwiState.Attach(KUidSystemCategory, Swi::KUidSoftwareInstallKey)); - CleanupClosePushL(checkSwiState); - - TRequestStatus swiStatus; - TInt swisState; - - while(ETrue) - { - checkSwiState.Subscribe(swiStatus); - checkSwiState.Get(KUidSystemCategory,Swi::KUidSoftwareInstallKey, swisState); - if(((swisState & Swi::KSwisOperationMask) == Swi::ESwisNone) && BaflUtils::FileExists(aFs,aFileName)) - { - checkSwiState.Cancel(); - break; - } - User::WaitForRequest(swiStatus); - } - - CleanupStack::PopAndDestroy(&checkSwiState); - - //Wait for swiobserver to shutdown - while(ETrue) - { - _LIT(KSWIObserverName,"swiobserver.exe*"); - TFindProcess finder(KSWIObserverName); - TFullName result; - if (KErrNone != finder.Next(result)) - { - break; - } - User::After(4000); - } - } // End of function.