Merge pull request #235 from zvezdan/fix-env-regex

Fix the regex for environment check in integ tests.
linkedin · Jul 9, 2018 · d544577 · d544577
2 parents 5db22d2 + ebf8294
commit d544577
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.../integTest/groovy/com/linkedin/gradle/python/plugin/PackageSettingsIntegrationTest.groovy b/.../integTest/groovy/com/linkedin/gradle/python/plugin/PackageSettingsIntegrationTest.groovy
@@ -74,7 +74,7 @@ class PackageSettingsIntegrationTest extends Specification {
         println result.output
 
         then: "we can observe the environment for 'foo' provided a few lines after its install is logged"
-        def match = result.output.find(/Installing foo[\s\S]+?Environment for[^\n]+: \{[^}]+\}/)
+        def match = result.output.find(/Installing foo[\s\S]+?Environment for[^\n]+: \{.+\}\s*\n/)
         match != null
         match.findAll('Installing ').size() == 1
         match.contains('CPPFLAGS=-I/some/custom/path/include')
@@ -347,7 +347,7 @@ class PackageSettingsIntegrationTest extends Specification {
         println result.output
 
         then: "we can observe the environment for 'foo' provided a few lines after its build is logged"
-        def match = result.output.find(/Installing foo\S* wheel[\s\S]+?Environment for[^\n]+: \{[^}]+\}/)
+        def match = result.output.find(/Installing foo\S* wheel[\s\S]+?Environment for[^\n]+: \{.+\}\s*\n/)
         match != null
         match.findAll('Installing ').size() == 1
         match.contains('CPPFLAGS=-I/some/custom/path/include')