fix tests

pharo-project · May 17, 2024 · 8eff2d5 · 8eff2d5
1 parent c391b71
commit 8eff2d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/PharoLauncher-Tests-Commands/PhLTestImageRepository.class.st b/src/PharoLauncher-Tests-Commands/PhLTestImageRepository.class.st
@@ -19,7 +19,10 @@ PhLTestImageRepository >> createImageNamed: aName in: aFolder [
 	| imageFile |
 	imageFile := aFolder / (aName , '.image').
 	aFolder ensureCreateDirectory.
-	imageFile binaryWriteStreamDo: [:stream | stream nextPutAll: #(105 25 0 0)].
+	imageFile binaryWriteStreamDo: [:stream | 
+		(ZnEndianessReadWriteStream on: stream ) 
+			nextLittleEndianNumber: 4 
+			put: PhLVirtualMachineManager imageFormat64bits ].
 	(aFolder / (aName , '.changes')) ensureCreateFile.
 	(aFolder / PhLImage versionFileName) writeStreamDo: [ :stream | stream nextPutAll: '70' ].
 	^ imageFile

diff --git a/src/PharoLauncher-Tests-Core/PhLImageTest.class.st b/src/PharoLauncher-Tests-Core/PhLImageTest.class.st
@@ -32,7 +32,7 @@ PhLImageTest >> setUp [
 		(ZnEndianessReadWriteStream on: stream) 
 			nextLittleEndianNumber: 4 
 			put: PhLVirtualMachineManager supportedImageFormat ].
-	image := PhLImage location: imageFileRef
+	image := PhLImage location: imageFileRef.
 	image pharoVersion: '110'
 ]
 

diff --git a/src/PharoLauncher-Tests-Core/PhLLaunchConfigurationTest.class.st b/src/PharoLauncher-Tests-Core/PhLLaunchConfigurationTest.class.st
@@ -160,6 +160,7 @@ PhLLaunchConfigurationTest >> testCannotLaunchWhenVmNotValidForArchitecture [
 	| launchConfig |
 
 	self writeIntoVersionFile: '11'.
+	image pharoVersion: nil.
 	launchConfig := PhLLaunchConfiguration defaultWithImage: image.
 
 	self deny: launchConfig vm isValidForArchitecture.

diff --git a/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st b/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st
@@ -119,7 +119,7 @@ PhLLaunchImageTest >> testCanLaunchImageWithNonAsciiCharactersUsingLoginShell [
 { #category : #tests }
 PhLLaunchImageTest >> testCanRun64bitImageOn64BitOnlyOS [
 	| image64 config commandToEval |
-	image64 := PhLOsXMojaveTestImage example.
+	image64 := PhLOsXCatalinaTestImage example.
 	commandToEval := '"''' , imageDir fullName , '/result'' asFileReference writeStreamDo:[ :s | s nextPutAll: (1 + 1) asString ]"'.
 	config := image64 defaultLaunchConfiguration.
 	config