From 6db4fdfd89fae610c2ed1f365342cad765a348f8 Mon Sep 17 00:00:00 2001 From: Jakob Reschke Date: Sun, 31 May 2020 20:47:53 +0200 Subject: [PATCH] Suppress load order merge warning in tests ...because it needlessly breaks smalltalkCI builds. --- .../instance/testMergeWithAddedArtifactOnBothSides.st | 1 + .../SquotWorkingCopyTest.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeWithAddedArtifactOnBothSides.st b/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeWithAddedArtifactOnBothSides.st index 9809ece04..c2c70e5a9 100644 --- a/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeWithAddedArtifactOnBothSides.st +++ b/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeWithAddedArtifactOnBothSides.st @@ -20,5 +20,6 @@ testMergeWithAddedArtifactOnBothSides self assert: diff hasConflicts. diff content startDiff chooseRight. request resume] + on: Warning do: [:e | e resume] ] valueSupplyingAnswers: {{'*'. #default}}. self assert: #right equals: (self workingCopy objectAt: 'added') contents. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json index 029247b1d..272945281 100644 --- a/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json @@ -20,7 +20,7 @@ "testMergeSingleArtifact" : "jr 4/29/2018 17:08", "testMergeTwoOrphanedVersions" : "jr 4/29/2018 16:56", "testMergeVersionWithLoadedObjects" : "jr 4/29/2018 17:34", - "testMergeWithAddedArtifactOnBothSides" : "jr 10/31/2017 21:35", + "testMergeWithAddedArtifactOnBothSides" : "jr 5/31/2020 20:47", "testMergeWithConflicts" : "jr 5/30/2019 00:26", "testMergeWithConflictsChooseRemote" : "jr 5/29/2019 23:36", "testMergeWithRemovedArtifactOnBothSides" : "jr 4/15/2018 00:06",