Merge pull request #1767 from jecisc/improve-tests

Avoid useless garbage collects
pharo-vcs · Nov 22, 2023 · 7800508 · 7800508
2 parents 83aea5c + a377d0d
commit 7800508
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Iceberg-Tests/IceGitTestFactory.class.st b/Iceberg-Tests/IceGitTestFactory.class.st
@@ -106,10 +106,13 @@ IceGitTestFactory >> remoteFileUrl [
 
 { #category : 'initialization' }
 IceGitTestFactory >> tearDownWithRepository: aRepository [
-		
+
 	aRepository ifNotNil: [
 		aRepository free.
-		Smalltalk garbageCollect.
-		aRepository location ifNotNil: #ensureDeleteAll ].
+		[ aRepository location ifNotNil: #ensureDeleteAll ]
+			on: CannotDeleteFileException
+			do: [ "On windows it is possible we need to finalize everything before deleting the files. We do not do it directly to avoid to lose too much speed"
+				Smalltalk garbageCollect.
+				aRepository location ifNotNil: #ensureDeleteAll ] ].
 	self remoteFileUrl asFileReference ensureDeleteAll
 ]
diff --git a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st
@@ -110,6 +110,9 @@ IceNotYetClonedRepositoryFixture >> setUp [
 { #category : 'running' }
 IceNotYetClonedRepositoryFixture >> tearDown [
 
-	Smalltalk garbageCollect.
-	self location ifNotNil: #ensureDeleteAll.
+	[ self location ifNotNil: #ensureDeleteAll ]
+		on: CannotDeleteFileException
+		do: [ "On windows it is possible we need to finalize everything before deleting the files. We do not do it directly to avoid to lose too much speed"
+			Smalltalk garbageCollect.
+			self location ifNotNil: #ensureDeleteAll ]
 ]