Suppress load order merge warning in tests

...because it needlessly breaks smalltalkCI builds.
hpi-swa · May 31, 2020 · 6db4fdf · 6db4fdf
1 parent 1f4aedd
commit 6db4fdf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...quot.package/SquotWorkingCopyTest.class/instance/testMergeWithAddedArtifactOnBothSides.st b/...quot.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.
diff --git 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",