diff options
author | gjoranv <gv@verizonmedia.com> | 2022-09-01 08:44:48 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-09-01 08:44:48 +0200 |
commit | a80b63f0f65b5d44444b4c47ee7803808b0fe8c6 (patch) | |
tree | 2ec904ed71a7207eec2ed3d2423a13f32ca9248f /container-core/src/test/java/com/yahoo | |
parent | 7973264e277d7ddffe69a4e5ac611c11b0693595 (diff) |
Reapply "Set duplicate bundles to the set of bundles from the failed generation."
This reverts commit c5d3f1d34c8dc637cc3cc38a8d3a246d3f32ce66.
Diffstat (limited to 'container-core/src/test/java/com/yahoo')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java index bc5b6d6069b..54ef2d41ac6 100644 --- a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java +++ b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java @@ -106,9 +106,10 @@ public class ApplicationBundleLoaderTest { assertEquals(1, bundlesToUninstall.size()); assertEquals(BUNDLE_2.getSymbolicName(), bundlesToUninstall.iterator().next().getSymbolicName()); - // Both bundles are still current, until the bundle from the failed gen will be uninstalled. - // Uninstalling is handled by the Deconstructor, not included in this test setup. - assertEquals(2, osgi.getCurrentBundles().size()); + // The bundle from the failed generation is not seen as current. It will still be installed, + // as uninstalling is handled by the Deconstructor, not included in this test setup. + assertEquals(1, osgi.getCurrentBundles().size()); + assertEquals(BUNDLE_1.getSymbolicName(), osgi.getCurrentBundles().get(0).getSymbolicName()); // Only the bundle-1 file reference is active, bundle-2 is removed. assertEquals(1, bundleLoader.getActiveFileReferences().size()); |