Merge "Bug 3086: Add timeout to SingleFeatureTest#installFeature"

diff --cc features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
index 5c8addc0d4634fccd202755552ebe093b7c8d4a5,648b5fcdfbaa6ba49f220c0ec40ee4a8ad8669a7..99f7511cb059062176e3688df6cf9ad4f0d0bf2a
--- 1/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
--- 2/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
@@@ -199,13 -201,14 +199,14 @@@ public class SingleFeatureTest 
          LOG.info("Successfully loaded repository {}", getRepoURI());
      }
  
-     @Test
+     // Give it 5 minutes max as we've seen feature install hang on jenkins.
+     @Test(timeout=300000)
      public void installFeature() throws Exception {
 -      LOG.info("Attempting to install feature {} {}", getFeatureName(),getFeatureVersion());
 -      featuresService.installFeature(getFeatureName(), getFeatureVersion());
 -      Feature f = featuresService.getFeature(getFeatureName(), getFeatureVersion());
 -      Assert.assertNotNull("Attempt to get feature "+ getFeatureName() + " " + getFeatureVersion() + "resulted in null" , f);
 -      Assert.assertTrue("Failed to install Feature: " + getFeatureName() + " " + getFeatureVersion(),featuresService.isInstalled(f));
 -      LOG.info("Successfull installed feature {} {}", getFeatureName(),getFeatureVersion());
 +        LOG.info("Attempting to install feature {} {}", getFeatureName(), getFeatureVersion());
 +        featuresService.installFeature(getFeatureName(), getFeatureVersion());
 +        Feature f = featuresService.getFeature(getFeatureName(), getFeatureVersion());
 +        Assert.assertNotNull("Attempt to get feature " + getFeatureName() + " " + getFeatureVersion() + "resulted in null", f);
 +        Assert.assertTrue("Failed to install Feature: " + getFeatureName() + " " + getFeatureVersion(), featuresService.isInstalled(f));
 +        LOG.info("Successfull installed feature {} {}", getFeatureName(), getFeatureVersion());
      }
  }