[TASK] Have bamboo plan updates and minor ac test stabilization 83/56883/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Mon, 7 May 2018 17:09:11 +0000 (19:09 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 7 May 2018 18:00:13 +0000 (20:00 +0200)
* bamboo composer environment is a9.3.0@dev
* Adapt a test result parsing to slightly changed git
  output in younger versions
* Raise a timeout when installing introduction package in ac
  tests for less false positives.

Resolves: #84944
Releases: master
Change-Id: I3f0ec103985a96d05d4a42fab8edd92fad219114
Reviewed-on: https://review.typo3.org/56883
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Build/bamboo/src/main/java/core/AbstractCoreSpec.java
typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlIntroductionPackageCest.php
typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlIntroductionPackageCest.php

index 10d183a..1159bdc 100644 (file)
@@ -45,7 +45,7 @@ abstract public class AbstractCoreSpec {
     protected static String projectName = "TYPO3 Core";
     protected static String projectKey = "CORE";
 
-    protected String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=9.2.0@dev";
+    protected String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=9.3.0@dev";
 
     protected String testingFrameworkBuildPath = "vendor/typo3/testing-framework/Resources/Core/Build/";
 
@@ -635,7 +635,7 @@ abstract public class AbstractCoreSpec {
                     .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
                     .inlineBody(
                         this.getScriptTaskBashInlineBody() +
-                        "git status | grep -q \"nothing to commit, working directory clean\""
+                        "git status | grep -q \"nothing to commit, working tree clean\""
                     )
             )
             .requirements(
index ed43d35..d781de6 100644 (file)
@@ -69,7 +69,7 @@ class InstallWithMysqlIntroductionPackageCest
         $I->switchToIFrame('list_frame');
         $I->waitForText('Get preconfigured distribution', 30);
         $I->click('.t3-button-action-installdistribution');
-        $I->waitForText('You successfully installed the distribution \'introduction\'', 30);
+        $I->waitForText('You successfully installed the distribution \'introduction\'', 120);
 
         // Verify default frontend is rendered
         $I->amOnPage('/');
index ebd0780..5c6358d 100644 (file)
@@ -65,7 +65,7 @@ class InstallWithPgsqlIntroductionPackageCest
         $I->switchToIFrame('list_frame');
         $I->waitForText('Get preconfigured distribution', 30);
         $I->click('.t3-button-action-installdistribution');
-        $I->waitForText('You successfully installed the distribution \'introduction\'', 30);
+        $I->waitForText('You successfully installed the distribution \'introduction\'', 120);
 
         // Verify default frontend is rendered
         $I->amOnPage('/');