Partial coverage run, refs 2057

SemanticMediaWiki · Jul 29, 2017 · fd284bc · fd284bc
1 parent 3a85c79
commit fd284bc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 38 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -15,7 +15,8 @@ tools:
     php_analyzer: true
     sensiolabs_security_checker: true
     external_code_coverage:
-        timeout: 1800 # Timeout in seconds
+        timeout: 3600 # Timeout in seconds
+        runs: 4 # Split tests across multiple runs
 
 checks:
     php:

diff --git a/.travis.yml b/.travis.yml
@@ -8,41 +8,15 @@ dist: trusty
 matrix:
   fast_finish: true
   include:
-    - env: DB=mysql; MW=REL1_29; PHPUNIT=5.7.*
+    - env: DB=mysql; MW=REL1_29; PHPUNIT=5.7.*; TYPE=coverage; COVERAGE_FILTER="--testsuite semantic-mediawiki-unit"
       php: 7.1
-    - env: DB=mysql; MW=REL1_28; FUSEKI=2.4.0
-      php: 5.5
-    - env: DB=mysql; MW=REL1_25; VIRTUOSO=6.1
-      php: 5.6
-    - env: DB=mysql; MW=REL1_23; SESAME=2.8.7
-      php: 5.5
-    - env: DB=sqlite; MW=REL1_27; SITELANG=ja
-      php: 5.5
-    - env: DB=postgres; MW=REL1_26;
-      php: 5.5
-    - env: DB=mysql; MW=REL1_26; BLAZEGRAPH=1.5.2; PHPUNIT=4.8.*
-      php: 5.6
-    - env: DB=mysql; MW=REL1_25; TYPE=benchmark; PHPUNIT=5.7.*
-      php: hhvm-3.18
-    - env: DB=sqlite; MW=master; PHPUNIT=5.7.*
-      php: hhvm-3.18
-    - env: DB=sqlite; MW=REL1_27; TYPE=composer; PHPUNIT=4.8.*
-      php: 5.6
-    - env: DB=mysql; MW=REL1_25; TYPE=relbuild
-      php: 5.5
-  allow_failures:
-    # Takes at least ~35 min to complete therefore allow it run without delaying
-    # the status update
-    - env: DB=mysql; MW=REL1_29; PHPUNIT=5.7.*
-    # Can fail when pushed/used with newly Composer dependencies
-    - env: DB=mysql; MW=REL1_25; TYPE=relbuild
-    # Can fail when pushed/used with newly Composer dependencies
-    - env: DB=sqlite; MW=REL1_27; TYPE=composer; PHPUNIT=4.8.*
-    # This is MW master, you never know what WMF developers have put in for easter eggs
-    - env: DB=sqlite; MW=master; PHPUNIT=5.7.*
-    # May take a moment and is non-critical therefore allow it to run without delaying the status
-    - env: DB=mysql; MW=REL1_25; TYPE=benchmark; PHPUNIT=5.7.*
-    - env: DB=mysql; MW=REL1_23; SESAME=2.8.7
+    - env: DB=mysql; MW=REL1_29; PHPUNIT=5.7.*; TYPE=coverage; COVERAGE_FILTER="--testsuite semantic-mediawiki-integration-jsonscript"
+      php: 7.1
+    - env: DB=mysql; MW=REL1_29; PHPUNIT=5.7.*; TYPE=coverage; COVERAGE_FILTER="--testsuite semantic-mediawiki-integration-import"
+      php: 7.1
+    - env: DB=mysql; MW=REL1_29; PHPUNIT=5.7.*; TYPE=coverage; COVERAGE_FILTER="--testsuite semantic-mediawiki-integration-others"
+      php: 7.1
+
 
 # Dec 16, 2015 (GCE switch): Travis support wrote (Tomcat + Java):
 # bug in the JDK: http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7089443.

diff --git a/composer.json b/composer.json
@@ -86,6 +86,7 @@
 	},
 	"scripts": {
 		"phpunit": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist",
+		"phpdbg": "phpdbg -qrr ../../tests/phpunit/phpunit.php -c phpunit.xml.dist",
 		"unit": [
 			"composer dump-autoload",
 			"composer phpunit -- --testsuite=semantic-mediawiki-unit"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -28,10 +28,16 @@
         </testsuite>
         <testsuite name="semantic-mediawiki-integration">
             <directory>tests/phpunit/Integration</directory>
+        </testsuite>
+        <testsuite name="semantic-mediawiki-integration-others">
+            <directory>tests/phpunit/Integration</directory>
             <exclude>tests/phpunit/Integration/MediaWiki/Import</exclude>
-            <exclude>tests/phpunit/Integration/System</exclude>
+            <exclude>tests/phpunit/Integration/JSONScript</exclude>
+        </testsuite>
+        <testsuite name="semantic-mediawiki-integration-jsonscript">
+            <directory>tests/phpunit/Integration/JSONScript</directory>
         </testsuite>
-        <testsuite name="semantic-mediawiki-import">
+        <testsuite name="semantic-mediawiki-integration-import">
             <directory>tests/phpunit/Integration/MediaWiki/Import</directory>
         </testsuite>
         <testsuite name="semantic-mediawiki-system">

diff --git a/tests/travis/run-tests.sh b/tests/travis/run-tests.sh
@@ -8,7 +8,7 @@ cd $MW_INSTALL_PATH/extensions/SemanticMediaWiki
 
 if [ "$TYPE" == "coverage" ]
 then
-	composer phpunit -- --coverage-clover $BASE_PATH/tests/coverage.clover
+	composer phpunit -- --coverage-clover $BASE_PATH/tests/coverage.clover $COVERAGE_FILTER
 elif [ "$TYPE" == "benchmark" ]
 then
 	composer phpunit -- --group semantic-mediawiki-benchmark