Merge remote-tracking branch 'origin/MAGETWO-59304' into troll_bugfix

Author: rganin

dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php

@@ -22,6 +22,16 @@ class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
      */
     protected static $changedFileList = '';
 
+    /**
+     * @var string Path for Magento's composer.json
+     */
+    protected static $composerFilePath = BP . '/composer.json';
+
+    /**
+     * @var bool Is tests executes on develop branch
+     */
+    protected static $isOnDevVersion = false;
+
     /**
      *  Set changed files paths and list for all projects
      */
@@ -30,13 +40,23 @@ public static function setUpBeforeClass()
         foreach (glob(self::$changedFilesPattern) as $changedFile) {
             self::$changedFileList .= file_get_contents($changedFile) . PHP_EOL;
         }
+
+        if (file_exists(self::$composerFilePath)) {
+            $jsonData = json_decode(file_get_contents(self::$composerFilePath));
+            if (substr((string) $jsonData->version, -4) == '-dev') {
+                self::$isOnDevVersion = true;
+            }
+        }
     }
 
     /**
      * Test changes for module.xml files
      */
     public function testModuleXmlFiles()
     {
+        if (self::$isOnDevVersion) {
+            $this->markTestSkipped('This test isn\'t applicable to the developer version of Magento');
+        }
         preg_match_all('|etc/module\.xml$|mi', self::$changedFileList, $matches);
         $this->assertEmpty(
             reset($matches),
@@ -50,6 +70,9 @@ public function testModuleXmlFiles()
      */
     public function testModuleSetupFiles()
     {
+        if (self::$isOnDevVersion) {
+            $this->markTestSkipped('This test isn\'t applicable to the developer version of Magento');
+        }
         preg_match_all('|app/code/Magento/[^/]+/Setup/[^/]+$|mi', self::$changedFileList, $matches);
         $this->assertEmpty(
             reset($matches),