mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 18:32:28 +02:00
Code Issues Projects Releases Wiki Activity

Fixed STC defect where a dependency would bring out an otherwise inactive step.

Browse Source 
Change-Id: I7963a6896d5a1d6bc4e369627b11b7c8690c1343
This commit is contained in:
Thomas Vachuska 2015-06-26 00:18:21 -07:00 committed by Gerrit Code Review
parent afdf4de12e
commit 177ece60f3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/test/bin/stc
View File

@ -7,6 +7,8 @@ VER=1.3.0-SNAPSHOT
JAR=~/.m2/repository/org/onosproject/onlab-stc/$VER/onlab-stc-$VER.jar
SCENARIOS=$ONOS_ROOT/tools/test/scenarios
DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=y"
scenario=${1:-smoke}
[ ! -f $scenario ] && scenario=$SCENARIOS/$scenario

4
utils/stc/src/main/java/org/onlab/stc/Compiler.java
View File

@ -309,7 +309,9 @@ public class Compiler {
print("dependency name=%s requires=%s", name, requires);
Step step = getStep(name, namespace);
processRequirements(step, requires, namespace);
if (!inactiveSteps.containsValue(step)) {
processRequirements(step, requires, namespace);
}
}
/**

4
utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
View File

@ -69,8 +69,8 @@ public class CompilerTest {
ProcessFlow flow = compiler.processFlow();
assertSame("incorrect scenario", scenario, compiler.scenario());
assertEquals("incorrect step count", 25, flow.getVertexes().size());
assertEquals("incorrect dependency count", 21, flow.getEdges().size());
assertEquals("incorrect step count", 24, flow.getVertexes().size());
assertEquals("incorrect dependency count", 17, flow.getEdges().size());
assertEquals("incorrect logDir",
TEST_DIR.getAbsolutePath() + "/foo", compiler.logDir().getPath());