1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 15:45:25 +02:00

Bug 314526 - [testing] RSEFileStoreTest does not clean up its intermediate files with dstore

This commit is contained in:
Martin Oberhuber 2010-05-26 16:59:32 +00:00
parent adea4eee0a
commit 91cd5404a9
2 changed files with 16 additions and 8 deletions

View file

@ -58,7 +58,7 @@ plugin@org.eclipse.rse.subsystems.shells.telnet=v200905272300,:pserver:anonymous
plugin@org.eclipse.rse.subsystems.terminals.core=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core
plugin@org.eclipse.rse.subsystems.terminals.ssh=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh
plugin@org.eclipse.rse.terminals.ui=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui
plugin@org.eclipse.rse.tests=v201005261600,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
plugin@org.eclipse.rse.tests=v201005261700,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
plugin@org.eclipse.rse.tests.framework=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
plugin@org.eclipse.rse.ui=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
plugin@org.eclipse.rse.useractions=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions

View file

@ -175,9 +175,12 @@ public class RSEFileStoreTest extends FileServiceBaseTest {
} finally {
try {
fTestStore.delete(EFS.NONE, getDefaultProgressMonitor());
} catch (CoreException ce) {
/* might be expected if fTestStore had no permissions */
} finally {
} catch (Throwable t) {
/* CoreException might be expected if fTestStore had no permissions */
if (! (t instanceof CoreException)) {
System.err.println("Unexpected exception in tearDown():"); //$NON-NLS-1$
t.printStackTrace();
}
IRemoteCmdSubSystem rcmd = getShellServiceSubSystem();
if (rcmd!=null) {
SimpleCommandOperation op = new SimpleCommandOperation(rcmd, fHomeDirectory, true);
@ -438,10 +441,15 @@ public class RSEFileStoreTest extends FileServiceBaseTest {
assertTrue("1.1", !info.exists());
// delete non-Existing
store.delete(EFS.NONE, getDefaultProgressMonitor());
// TODO IFileStore.delete() does not specify whether deleting a
// non-existing file should throw an Exception.
// EFS.getLocalFileSystem() does not throw the exception.
try {
store.delete(EFS.NONE, getDefaultProgressMonitor());
} catch(CoreException ce) {
// TODO IFileStore.delete() does not specify whether deleting a
// non-existing file should throw an Exception.
// EFS.getLocalFileSystem() does not throw the exception.
// Local and SSH don't either. DStore does throw.
// For now, ignore this.
}
info = store.fetchInfo(EFS.NONE, getDefaultProgressMonitor());
assertTrue("1.2", !info.exists());