aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwr...@apache.org
Subject svn commit: r1380666 - in /aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests: IntegrationTest.java RootSubsystemTest.java
Date Tue, 04 Sep 2012 14:17:16 GMT
Author: jwross
Date: Tue Sep  4 14:17:16 2012
New Revision: 1380666

URL: http://svn.apache.org/viewvc?rev=1380666&view=rev
Log:
ARIES-910: Attempts to fix the one remaining subsystems test failure on the build machine
(e.g.see https://builds.apache.org/job/Aries/org.apache.aries.subsystem$org.apache.aries.subsystem.itests/1658/testReport/org.apache.aries.subsystem.itests/RootSubsystemTest/testServiceEvents__equinox_3_8_0_V20120529_1548_/).
The issue does not occur in a local build and seems to be happening when the version of the
requested artifact to install is computed. This fix bypasses the computation and specifies
the version explicitly.

Modified:
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/IntegrationTest.java
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/IntegrationTest.java?rev=1380666&r1=1380665&r2=1380666&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/IntegrationTest.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/IntegrationTest.java
Tue Sep  4 14:17:16 2012
@@ -119,6 +119,11 @@ public abstract class IntegrationTest {
         MavenArtifactProvisionOption mvnUrl = mavenBundleInTest(groupId, artifactId);
         return bundleContext.installBundle(mvnUrl.getURL());
     }
+    
+    protected Bundle installBundle(String groupId, String artifactId, String version) throws
Exception {
+    	MavenArtifactProvisionOption mvnUrl = CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId).version(version);
+        return bundleContext.installBundle(mvnUrl.getURL());
+    }
 
     protected Bundle getInstalledBundle(String symbolicName) {
         for (Bundle b : bundleContext.getBundles()) {

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java?rev=1380666&r1=1380665&r2=1380666&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java
Tue Sep  4 14:17:16 2012
@@ -53,7 +53,7 @@ public class RootSubsystemTest extends S
 		core.stop();
 		assertServiceEventsStop(root);
 		core.uninstall();
-		core = installBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.core");
+		core = installBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.core", "1.0.0-SNAPSHOT");
 		core.start();
 		// There should be install events since the persisted root subsystem was
 		// deleted when the subsystems implementation bundle was uninstalled.



Mime
View raw message