Thomas Vachuska

Fixing an issue with app activation.

Adding a log check as part of archetypes scenario.

Change-Id: Iad53c5430530513939ef92a890559f9841e9ecc1
...@@ -370,8 +370,11 @@ public class ApplicationArchive ...@@ -370,8 +370,11 @@ public class ApplicationArchive
370 */ 370 */
371 protected boolean setActive(String appName) { 371 protected boolean setActive(String appName) {
372 try { 372 try {
373 - return appFile(appName, "active").createNewFile() && updateTime(appName); 373 + File active = appFile(appName, "active");
374 + createParentDirs(active);
375 + return active.createNewFile() && updateTime(appName);
374 } catch (IOException e) { 376 } catch (IOException e) {
377 + log.warn("Unable to mark app {} as active", appName, e);
375 throw new ApplicationException("Unable to mark app as active", e); 378 throw new ApplicationException("Unable to mark app as active", e);
376 } 379 }
377 } 380 }
......
...@@ -20,6 +20,7 @@ import com.google.common.io.ByteStreams; ...@@ -20,6 +20,7 @@ import com.google.common.io.ByteStreams;
20 import com.google.common.io.Files; 20 import com.google.common.io.Files;
21 import org.junit.After; 21 import org.junit.After;
22 import org.junit.Before; 22 import org.junit.Before;
23 +import org.junit.Ignore;
23 import org.junit.Test; 24 import org.junit.Test;
24 import org.onlab.util.Tools; 25 import org.onlab.util.Tools;
25 import org.onosproject.app.ApplicationDescription; 26 import org.onosproject.app.ApplicationDescription;
...@@ -149,6 +150,7 @@ public class ApplicationArchiveTest { ...@@ -149,6 +150,7 @@ public class ApplicationArchiveTest {
149 } 150 }
150 151
151 @Test(expected = ApplicationException.class) 152 @Test(expected = ApplicationException.class)
153 + @Ignore("No longer needed")
152 public void setBadActive() throws IOException { 154 public void setBadActive() throws IOException {
153 aar.setActive("org.foo.BAD"); 155 aar.setActive("org.foo.BAD");
154 } 156 }
......
...@@ -76,5 +76,9 @@ ...@@ -76,5 +76,9 @@
76 76
77 <step name="Uninstall-App" requires="^" 77 <step name="Uninstall-App" requires="^"
78 exec="onos-app ${OCI} uninstall org.foo.app"/> 78 exec="onos-app ${OCI} uninstall org.foo.app"/>
79 +
80 + <parallel var="${OC#}">
81 + <step name="Archetypes-Check-Logs-${#}" exec="onos-check-logs ${OC#}"/>
82 + </parallel>
79 </group> 83 </group>
80 </scenario> 84 </scenario>
......