Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Kaegi2010-03-05 15:13:53 -0500
committerSimon Kaegi2010-03-05 15:13:53 -0500
commit6dd835d615482635c0acec42c8e3f34e087ea3b4 (patch)
treec23ff67dc1a575d2ab0638f85dfed1fb0d882438
parent70aab4ba4d0e8411d5a21cb159e241458757a779 (diff)
downloadrt.equinox.p2-6dd835d615482635c0acec42c8e3f34e087ea3b4.tar.gz
rt.equinox.p2-6dd835d615482635c0acec42c8e3f34e087ea3b4.tar.xz
rt.equinox.p2-6dd835d615482635c0acec42c8e3f34e087ea3b4.zip
Bug 300050 - Shared Install Test Failure in N20100118-2000
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTests.java7
2 files changed, 5 insertions, 10 deletions
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
index 1802d344c..f7806aaa3 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
@@ -449,11 +449,9 @@ public class ProfileSynchronizer {
private IStatus setProperty(String key, String value, ProvisioningContext provisioningContext, IProgressMonitor monitor) {
IEngine engine = (IEngine) agent.getService(IEngine.SERVICE_NAME);
- IPlanner planner = (IPlanner) agent.getService(IPlanner.SERVICE_NAME);
- ProfileChangeRequest addPropertyRequest = new ProfileChangeRequest(profile);
- addPropertyRequest.setProfileProperty(key, value);
- IProvisioningPlan plan = planner.getProvisioningPlan(addPropertyRequest, provisioningContext, monitor);
- IPhaseSet phaseSet = PhaseSetFactory.createDefaultPhaseSetExcluding(new String[] {PhaseSetFactory.PHASE_COLLECT, PhaseSetFactory.PHASE_CHECK_TRUST});
+ IProvisioningPlan plan = engine.createPlan(profile, provisioningContext);
+ plan.setProfileProperty(key, value);
+ IPhaseSet phaseSet = PhaseSetFactory.createPhaseSetIncluding(new String[] {PhaseSetFactory.PHASE_PROPERTY});
return engine.perform(plan, phaseSet, monitor);
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTests.java
index 0edfcacca..fa9acd566 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallTests.java
@@ -91,9 +91,7 @@ public class SharedInstallTests extends AbstractReconcilerTest {
assertFalse("0.1", userBundlesInfo.exists());
assertFalse("0.2", userConfigIni.exists());
reconcileReadOnly("0.21");
-
- // This line is disabled until bug 300050 is also fixed
- // assertFalse("0.3", userBundlesInfo.exists());
+ assertFalse("0.3", userBundlesInfo.exists());
assertTrue("0.4", userConfigIni.exists());
Properties props = new Properties();
@@ -104,8 +102,7 @@ public class SharedInstallTests extends AbstractReconcilerTest {
is.close();
}
assertTrue("0.5", props.containsKey("osgi.sharedConfiguration.area"));
- assertTrue("0.51", props.containsKey("eclipse.p2.data.area"));
- assertTrue("0.6", props.size() == 2);
+ assertTrue("0.6", props.size() == 1);
} finally {
cleanupReadOnlyInstall();
}

Back to the top