summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2013-11-25 05:36:16 (EST)
committerKrzysztof Daniel2013-11-25 05:36:16 (EST)
commit1413f8a5f4b1b4876cbaa64a9d69141126b11ba8 (patch)
tree3a5454178d9e8b6d5c7f31d6368581cf73517c57
parent0dae0e98a851cc5644f59ef9945e1217e129462a (diff)
downloadrt.equinox.p2-1413f8a5f4b1b4876cbaa64a9d69141126b11ba8.zip
rt.equinox.p2-1413f8a5f4b1b4876cbaa64a9d69141126b11ba8.tar.gz
rt.equinox.p2-1413f8a5f4b1b4876cbaa64a9d69141126b11ba8.tar.bz2
bug 422043 - 7 ConfigurationTests failed in official buildI20131126-0800refs/changes/08/18808/1
Instrumentation. It's likely that tests fail because configuration uses windows specific line delimiters, but tests use unix like ones. Change-Id: I4994cb5bcf950b257e89b18672f51e089a5a3277 Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
index 0f9c95f..c9d750d 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
@@ -497,15 +497,19 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
* has a url matching the given location.
*/
public boolean removeSite(Configuration configuration, String location) {
- System.out.println("remove site=" + location);
+ System.out.println("remove site location = " + location);
IPath path = new Path(location);
List sites = configuration.getSites();
- System.out.println("sites=" + sites);
for (Iterator iter = sites.iterator(); iter.hasNext();) {
Site tempSite = (Site) iter.next();
String siteURL = tempSite.getUrl();
- if (path.equals(new Path(siteURL)))
- return configuration.removeSite(tempSite);
+ if (path.equals(new Path(siteURL))) {
+ System.out.println("Match " + siteURL);
+ boolean result = configuration.removeSite(tempSite);
+ System.out.println("removed " + result);
+ return result;
+ }
+ System.out.println("No match " + siteURL);
}
return false;
}