Revert "bug 420260: org.eclipse.equinox.p2.tests take 1.5h longer on the

Mac "

This reverts commit 8c9187a7cdfca9ae0c93566c5f383a6c7e6137bf, as it was
released only for instrumentation.

Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>
Change-Id: I5ca7c147d8434b3a72b84d38953817ff541b9066

4 files changed, 0 insertions, 10 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java
index 3befbeb67..a3bb0d0d8 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java
@@ -48,7 +48,6 @@ public class ArtifactMirrorApplicationTest extends AbstractProvisioningTest {
 	 * @see org.eclipse.equinox.p2.tests.AbstractProvisioningTest#setUp()
 	 */
 	protected void setUp() throws Exception {
-		TestTimeoutDump.setUp(this, 60);
 		super.setUp();
 		//load all the repositories
 		sourceRepoLocation = getTestData("0.0", "/testData/mirror/mirrorSourceRepo1 with space");
@@ -75,7 +74,6 @@ public class ArtifactMirrorApplicationTest extends AbstractProvisioningTest {
 		//delete the destination location (no left over files for the next test)
 		delete(destRepoLocation);
 		super.tearDown();
-		TestTimeoutDump.tearDown();
 	}
 
 	/**
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
index 9c40d79a5..d89002c79 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
@@ -24,7 +24,6 @@ import org.eclipse.equinox.p2.repository.IRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
-import org.eclipse.equinox.p2.tests.TestTimeoutDump;
 
 /**
  * Test API of the basic mirror application functionality's implementation.
@@ -40,7 +39,6 @@ public class MetadataMirrorApplicationTest extends AbstractProvisioningTest {
 	 * @see org.eclipse.equinox.p2.tests.AbstractProvisioningTest#setUp()
 	 */
 	protected void setUp() throws Exception {
-		TestTimeoutDump.setUp(this, 60);
 		super.setUp();
 		//load all the repositories
 		sourceRepoLocation = getTestData("0.0", "/testData/mirror/mirrorSourceRepo1 with space");
@@ -67,7 +65,6 @@ public class MetadataMirrorApplicationTest extends AbstractProvisioningTest {
 		//delete the destination location (no left over files for the next test)
 		delete(destRepoLocation);
 		super.tearDown();
-		TestTimeoutDump.tearDown();
 	}
 
 	/**
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java
index a0f20dbbf..df65a10ce 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationArtifactTest.java
@@ -50,7 +50,6 @@ public class NewMirrorApplicationArtifactTest extends AbstractProvisioningTest {
 	 * @see org.eclipse.equinox.p2.tests.AbstractProvisioningTest#setUp()
 	 */
 	protected void setUp() throws Exception {
-		TestTimeoutDump.setUp(this, 60);
 		super.setUp();
 		//load all the repositories
 		sourceRepoLocation = getTestData("0.0", "/testData/mirror/mirrorSourceRepo1 with space");
@@ -76,7 +75,6 @@ public class NewMirrorApplicationArtifactTest extends AbstractProvisioningTest {
 		//delete the destination location (no left over files for the next test)
 		delete(destRepoLocation);
 		super.tearDown();
-		TestTimeoutDump.tearDown();
 	}
 
 	private StringBuffer basicRunMirrorApplication(String message, URI source, URI destination, Boolean append, Boolean formatDestination, String destName) throws Exception {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
index 606394337..863c329f5 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
@@ -26,7 +26,6 @@ import org.eclipse.equinox.p2.repository.IRepositoryReference;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
-import org.eclipse.equinox.p2.tests.TestTimeoutDump;
 import org.eclipse.osgi.util.NLS;
 
 /*
@@ -46,7 +45,6 @@ public class NewMirrorApplicationMetadataTest extends AbstractProvisioningTest {
 	 * @see org.eclipse.equinox.p2.tests.AbstractProvisioningTest#setUp()
 	 */
 	protected void setUp() throws Exception {
-		TestTimeoutDump.setUp(this, 60);
 		super.setUp();
 		//load all the repositories
 		sourceRepoLocation = getTestData("0.0", "/testData/mirror/mirrorSourceRepo1 with space");
@@ -75,7 +73,6 @@ public class NewMirrorApplicationMetadataTest extends AbstractProvisioningTest {
 		//delete the destination location (no left over files for the next test)
 		delete(destRepoLocation);
 		super.tearDown();
-		TestTimeoutDump.tearDown();
 	}
 
 	/**