Merge pull request #2507 from telstra/separate_test_runner_fix

Fix for separate functional test execution
telstra · Jun 14, 2019 · 9e558c3 · 9e558c3
2 parents 12d1fda + 8b219d5
commit 9e558c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.../main/groovy/org/openkilda/functionaltests/extension/spring/SpringContextExtension.groovy b/.../main/groovy/org/openkilda/functionaltests/extension/spring/SpringContextExtension.groovy
@@ -37,7 +37,7 @@ class SpringContextExtension extends AbstractGlobalExtension implements Applicat
                 TagExtension.collectAllTags(nonSpecialFeatures[0]).contains(Tag.HARDWARE)
         specInfo.getAllFeatures().find {
             it.featureMethod.getAnnotation(PrepareSpringContextDummy)
-        }?.excluded = !(nonSpecialFeatures[0].parameterized || isProfileDependent) ||
+        }?.excluded = !((nonSpecialFeatures.size() > 0 && nonSpecialFeatures[0].parameterized)|| isProfileDependent) ||
                 specInfo.getFeatures().every { it.excluded || it.skipped } as boolean
 
         specInfo.allFixtureMethods*.addInterceptor(new IMethodInterceptor() {

diff --git a/...al-tests/src/main/groovy/org/openkilda/functionaltests/extension/tags/TagExtension.groovy b/...al-tests/src/main/groovy/org/openkilda/functionaltests/extension/tags/TagExtension.groovy
@@ -109,6 +109,8 @@ class TagExtension extends AbstractGlobalExtension {
     }
 
     static Set<Tag> collectAllTags(IterationInfo iteration) {
+        if (iteration == null)
+            return [] as Set
         def feature = iteration.feature
         def iterationTags = (feature.featureMethod.getAnnotation(IterationTags)?.value()?.toList() ?: [] +
                 feature.featureMethod.getAnnotation(IterationTag)).findAll()