use a copy of the image for tests.

Author: demarey

src/PharoLauncher-Tests-Commands/PhLLaunchImageCommandTest.class.st

@@ -39,7 +39,7 @@ PhLLaunchImageCommandTest >> initScript [
 
 { #category : 'helper' }
 PhLLaunchImageCommandTest >> launchImage [
-	self selectImage.
+
 	process ifNotNil: [ self error: 'Currently one execution of image per test case.' ].
 	process := runCommand execute
 ]
@@ -120,12 +120,7 @@ PhLLaunchImageCommandTest >> testAttachingInitializationScriptSetFlagToShouldRun
 PhLLaunchImageCommandTest >> testCanLaunchImage [
 	self timeLimit: 30 seconds.
 
-	image := PhLPharoStableImageResource current image.
-		
-	presenter 
-		unselectAll;
-		selection: { image }.
-
+	self useNewStableImageAndSetItAsSelectedImageInImagesPresenter.
 	image addLaunchConfiguration: 
 		(image defaultLaunchConfiguration asLaunchConfiguration
 			vmArguments: #('--headless');  "be able to run test without X session"
@@ -141,6 +136,7 @@ PhLLaunchImageCommandTest >> testCanLaunchImage [
 { #category : 'tests' }
 PhLLaunchImageCommandTest >> testExecutingImageWithScriptShouldSetFlagToShouldNotRun [
 
+	self useNewStableImageAndSetItAsSelectedImageInImagesPresenter.
 	self addInitializationScriptToImage.
 	self launchImage.
 
@@ -189,3 +185,12 @@ PhLLaunchImageCommandTest >> testRunningAnImageRemovesTheInitializationScript [
 
 	self assert: image initializationScript path equals: self initScript path
 ]
+
+{ #category : 'helper' }
+PhLLaunchImageCommandTest >> useNewStableImageAndSetItAsSelectedImageInImagesPresenter [
+
+	image := PhLPharoStableImageResource current newImage.
+	presenter 
+		unselectAll;
+		selection: { image }
+]

src/PharoLauncher-Tests-Commands/PhLLaunchImageFromDiskCommandTest.class.st

@@ -10,6 +10,12 @@ Class {
 	#package : 'PharoLauncher-Tests-Commands'
 }
 
+{ #category : 'accessing' }
+PhLLaunchImageFromDiskCommandTest class >> resources [
+
+	^ { PhLPharoStableImageResource }
+]
+
 { #category : 'running' }
 PhLLaunchImageFromDiskCommandTest >> setUp [
 

src/PharoLauncher-Tests-Core/PhLPharoStableImageResource.class.st

@@ -13,7 +13,15 @@ Class {
 	#package : 'PharoLauncher-Tests-Core'
 }
 
-{ #category : 'fetching' }
+{ #category : 'private' }
+PhLPharoStableImageResource >> copyImageTo: aDirectory [
+
+	| command |
+	command := 'cp -R ', self extractionDir fullName surroundedBySingleQuotes , ' ', aDirectory fullName surroundedBySingleQuotes.
+	LibC runCommand: command
+]
+
+{ #category : 'private' }
 PhLPharoStableImageResource >> downloadPharoStableImage [
 
 	imageZipFile := self workingDir / 'stable-64.zip'.
@@ -22,30 +30,45 @@ PhLPharoStableImageResource >> downloadPharoStableImage [
 		toFile: imageZipFile
 ]
 
-{ #category : 'fetching' }
+{ #category : 'private' }
 PhLPharoStableImageResource >> extractPharoImage [
-
-	| imageFile |
+	
+	self extractionDir ensureCreateDirectory.
+	
 	PhLVirtualMachineManager 
 		unzip: self imageZipFile 
-		to: self workingDir.
-		
-	imageFile := (self workingDir childrenMatching: '*.image') first.
-	image := PhLImage location: imageFile.
+		to: self extractionDir
+]
+
+{ #category : 'private - accessing' }
+PhLPharoStableImageResource >> extractionDir [
+
+	^ self workingDir / 'extracted'
 ]
 
-{ #category : 'accessing' }
+{ #category : 'private - accessing' }
 PhLPharoStableImageResource >> image [
 
 	^ image
 ]
 
-{ #category : 'accessing' }
+{ #category : 'private - accessing' }
 PhLPharoStableImageResource >> imageZipFile [
 
 	^ imageZipFile
 ]
 
+{ #category : 'running' }
+PhLPharoStableImageResource >> newImage [
+
+	| imageDir imageFile |
+	imageDir := self workingDir / (UUID new asString).
+	self copyImageTo: imageDir.
+	imageFile := (imageDir childrenMatching: '*.image') first.
+	
+	^ PhLImage location: imageFile
+]
+
 { #category : 'running' }
 PhLPharoStableImageResource >> setUp [ 
 
@@ -62,7 +85,7 @@ PhLPharoStableImageResource >> tearDown [
 	super tearDown
 ]
 
-{ #category : 'accessing' }
+{ #category : 'private - accessing' }
 PhLPharoStableImageResource >> workingDir [
 
 	^ workingDir