[TASK] Raise typo3/testing-framework to 3.6.0 34/57134/3
authorChristian Kuhn <lolli@schwarzbu.ch>
Wed, 6 Jun 2018 22:14:31 +0000 (00:14 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Wed, 6 Jun 2018 22:43:40 +0000 (00:43 +0200)
composer updade typo3/testing-framework

The update brings a couple of cleanups and bug fixes
and an improved functional test case splitter script
now used in bamboo.

Resolves: #85171
Releases: master
Change-Id: I79e30fd4e93e4a1635a74e225d4801dfb1768ad4
Reviewed-on: https://review.typo3.org/57134
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
composer.lock

index 627af5f..d17f912 100644 (file)
@@ -249,7 +249,11 @@ abstract public class AbstractCoreSpec {
         ArrayList<Job> jobs = new ArrayList<Job>();
 
         for (int i=1; i<=numberOfChunks; i++) {
-            jobs.add(new Job("Accept my " + requirementIdentifier + " 0" + i, new BambooKey("ACMY" + requirementIdentifier + "0" + i))
+            String formattedI = "" + i;
+            if (i < 10) {
+                formattedI = "0" + i;
+            }
+            jobs.add(new Job("Accept my " + requirementIdentifier + " " + formattedI, new BambooKey("ACMY" + requirementIdentifier + formattedI))
                 .description("Run acceptance tests" + requirementIdentifier)
                 .pluginConfigurations(this.getDefaultJobPluginConfiguration())
                 .tasks(
@@ -265,7 +269,7 @@ abstract public class AbstractCoreSpec {
                             "./" + this.testingFrameworkBuildPath + "Scripts/splitAcceptanceTests.sh " + numberOfChunks + "\n"
                         ),
                     new CommandTask()
-                        .description("Execute codeception acceptance suite group " + i)
+                        .description("Execute codeception acceptance suite group " + formattedI)
                         .executable("codecept")
                         .argument("run Acceptance -d -g AcceptanceTests-Job-" + i + " -c " + this.testingFrameworkBuildPath + "AcceptanceTests.yml --xml reports.xml --html reports.html")
                         .environmentVariables(this.credentialsMysql)
@@ -285,6 +289,7 @@ abstract public class AbstractCoreSpec {
                     .shared(false)
                 )
                 .cleanWorkingDirectory(true)
+                .enabled(false)
             );
         }
 
@@ -301,8 +306,12 @@ abstract public class AbstractCoreSpec {
     protected ArrayList<Job> getJobsFunctionalTestsMysql(int numberOfChunks, Requirement requirement, String requirementIdentifier) {
         ArrayList<Job> jobs = new ArrayList<Job>();
 
-        for (int i=0; i<numberOfChunks; i++) {
-            jobs.add(new Job("Func mysql " + requirementIdentifier + " 0" + i, new BambooKey("FMY" + requirementIdentifier + "0" + i))
+        for (int i=1; i<=numberOfChunks; i++) {
+            String formattedI = "" + i;
+            if (i < 10) {
+                formattedI = "0" + i;
+            }
+            jobs.add(new Job("Func mysql " + requirementIdentifier + " " + formattedI, new BambooKey("FMY" + requirementIdentifier + formattedI))
                 .description("Run functional tests on mysql DB " + requirementIdentifier)
                 .pluginConfigurations(this.getDefaultJobPluginConfiguration())
                 .tasks(
@@ -311,7 +320,7 @@ abstract public class AbstractCoreSpec {
                     this.getTaskComposerInstall(),
                     this.getTaskSplitFunctionalJobs(numberOfChunks),
                     new ScriptTask()
-                        .description("Run phpunit with functional chunk 0" + i)
+                        .description("Run phpunit with functional chunk " + formattedI)
                         .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
                         .inlineBody(
                             this.getScriptTaskBashInlineBody() +
@@ -344,8 +353,12 @@ abstract public class AbstractCoreSpec {
     protected ArrayList<Job> getJobsFunctionalTestsMssql(int numberOfChunks, Requirement requirement, String requirementIdentifier) {
         ArrayList<Job> jobs = new ArrayList<Job>();
 
-        for (int i=0; i<numberOfChunks; i++) {
-            jobs.add(new Job("Func mssql " + requirementIdentifier + " 0" + i, new BambooKey("FMS" + requirementIdentifier + "0" + i))
+        for (int i=1; i<=numberOfChunks; i++) {
+            String formattedI = "" + i;
+            if (i < 10) {
+                formattedI = "0" + i;
+            }
+            jobs.add(new Job("Func mssql " + requirementIdentifier + " " + formattedI, new BambooKey("FMS" + requirementIdentifier + formattedI))
                 .description("Run functional tests on mysql DB " + requirementIdentifier)
                 .pluginConfigurations(this.getDefaultJobPluginConfiguration())
                 .tasks(
@@ -354,7 +367,7 @@ abstract public class AbstractCoreSpec {
                     this.getTaskComposerInstall(),
                     this.getTaskSplitFunctionalJobs(numberOfChunks),
                     new ScriptTask()
-                        .description("Run phpunit with functional chunk 0" + i)
+                        .description("Run phpunit with functional chunk " + formattedI)
                         .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
                         .inlineBody(
                             this.getScriptTaskBashInlineBody() +
@@ -388,8 +401,12 @@ abstract public class AbstractCoreSpec {
     protected ArrayList<Job> getJobsFunctionalTestsPgsql(int numberOfChunks, Requirement requirement, String requirementIdentifier) {
         ArrayList<Job> jobs = new ArrayList<Job>();
 
-        for (int i=0; i<numberOfChunks; i++) {
-            jobs.add(new Job("Func pgsql " + requirementIdentifier + " 0" + i, new BambooKey("FPG" + requirementIdentifier + "0" + i))
+        for (int i=1; i<=numberOfChunks; i++) {
+            String formattedI = "" + i;
+            if (i < 10) {
+                formattedI = "0" + i;
+            }
+            jobs.add(new Job("Func pgsql " + requirementIdentifier + " " + formattedI, new BambooKey("FPG" + requirementIdentifier + formattedI))
                 .description("Run functional tests on pgsql DB " + requirementIdentifier)
                 .pluginConfigurations(this.getDefaultJobPluginConfiguration())
                 .tasks(
@@ -398,7 +415,7 @@ abstract public class AbstractCoreSpec {
                     this.getTaskComposerInstall(),
                     this.getTaskSplitFunctionalJobs(numberOfChunks),
                     new ScriptTask()
-                        .description("Run phpunit with functional chunk 0" + i)
+                        .description("Run phpunit with functional chunk " + formattedI)
                         .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
                         .inlineBody(
                             this.getScriptTaskBashInlineBody() +
@@ -718,8 +735,8 @@ abstract public class AbstractCoreSpec {
     protected ArrayList<Job> getJobUnitPhpRandom(int numberOfRuns, Requirement requirement, String requirementIdentifier) {
         ArrayList<Job> jobs = new ArrayList<Job>();
 
-        for (int i=0; i<numberOfRuns; i++) {
-            jobs.add(new Job("Unit " + requirementIdentifier + " random 0" + i, new BambooKey("UTR" + requirementIdentifier + "0" + i))
+        for (int i=1; i<=numberOfRuns; i++) {
+            jobs.add(new Job("Unit " + requirementIdentifier + " random " + i, new BambooKey("UTR" + requirementIdentifier + i))
                 .description("Run unit tests on " + requirementIdentifier + " in random order 0" + i)
                 .pluginConfigurations(this.getDefaultJobPluginConfiguration())
                 .tasks(
@@ -894,7 +911,7 @@ abstract public class AbstractCoreSpec {
             .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE)
             .inlineBody(
                 this.getScriptTaskBashInlineBody() +
-                "./" + this.testingFrameworkBuildPath + "Scripts/splitFunctionalTests.sh " + numberOfJobs
+                "./" + this.testingFrameworkBuildPath + "Scripts/splitFunctionalTests.php " + numberOfJobs + " -v"
             );
     }
 
index d8eaf7a..4e27dc8 100644 (file)
         },
         {
             "name": "typo3/testing-framework",
-            "version": "3.5.3",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/testing-framework.git",
-                "reference": "53723f9b88385ef2b43fe920cadf7acb77d3fa62"
+                "reference": "f22b5936da6886a9197a341aa8b8f4a2c29f05d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/53723f9b88385ef2b43fe920cadf7acb77d3fa62",
-                "reference": "53723f9b88385ef2b43fe920cadf7acb77d3fa62",
+                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/f22b5936da6886a9197a341aa8b8f4a2c29f05d7",
+                "reference": "f22b5936da6886a9197a341aa8b8f4a2c29f05d7",
                 "shasum": ""
             },
             "require": {
                 "tests",
                 "typo3"
             ],
-            "time": "2018-05-13T12:28:19+00:00"
+            "time": "2018-06-06T22:30:08+00:00"
         },
         {
             "name": "webmozart/assert",