Merge pull request #662 from theseion/setup-test-resources-only-once

feat: only instantiate test resources once in Pharo

gtoolkit/run.sh

@@ -176,13 +176,19 @@ gtoolkit::load_project() {
         metacello := Metacello new
             baseline: 'SmalltalkCI';
             repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-            onUpgrade: [ :ex | ex useIncoming ].
+            onUpgrade: [ :ex | ex useIncoming ];
+            ignoreImage.
         (Metacello canUnderstand: #onConflictUseIncoming)
             ifTrue: [ metacello onConflictUseIncoming ]
             ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-        metacello load ]
-            on: Warning
-            do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
     smalltalkCI := Smalltalk at: #SmalltalkCI.
     smalltalkCI load: '$(resolve_path "${config_ston}")'.
     (smalltalkCI isHeadless or: [ smalltalkCI promptToProceed ])
@@ -205,13 +211,19 @@ gtoolkit::test_project() {
                 metacello := Metacello new
                     baseline: 'SmalltalkCI';
                     repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-                    onUpgrade: [ :ex | ex useIncoming ].
+                    onUpgrade: [ :ex | ex useIncoming ];
+                    ignoreImage.
                 (Metacello canUnderstand: #onConflictUseIncoming)
                     ifTrue: [ metacello onConflictUseIncoming ]
                     ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-                metacello load ]
-                    on: Warning
-                    do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
             Smalltalk at: #SmalltalkCI ].
     smalltalkCI test: '$(resolve_path "${config_ston}")'
   "

pharo/run.sh

@@ -367,13 +367,19 @@ pharo::load_project() {
         metacello := Metacello new
             baseline: 'SmalltalkCI';
             repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-            onUpgrade: [ :ex | ex useIncoming ].
+            onUpgrade: [ :ex | ex useIncoming ];
+            ignoreImage.
         (Metacello canUnderstand: #onConflictUseIncoming)
             ifTrue: [ metacello onConflictUseIncoming ]
             ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-        metacello load ]
-            on: Warning
-            do: [ :w | w resume ].
+        ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+          on: KeyNotFound
+          do: [ :keyEx | keyEx resumeUnchecked: nil ])
+            ifNil: [ metacello load ]
+            ifNotNil: [ :exceptionClass |
+              [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                on: Warning
+                do: [ :w | w resume ].
     smalltalkCI := Smalltalk at: #SmalltalkCI.
     smalltalkCI load: '$(resolve_path "${config_ston}")'.
     (smalltalkCI isHeadless or: [ smalltalkCI promptToProceed ])
@@ -395,13 +401,19 @@ pharo::test_project() {
                 metacello := Metacello new
                     baseline: 'SmalltalkCI';
                     repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-                    onUpgrade: [ :ex | ex useIncoming ].
+                    onUpgrade: [ :ex | ex useIncoming ];
+                    ignoreImage.
                 (Metacello canUnderstand: #onConflictUseIncoming)
                     ifTrue: [ metacello onConflictUseIncoming ]
                     ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-                metacello load ]
-                    on: Warning
-                    do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
             Smalltalk at: #SmalltalkCI ].
     smalltalkCI test: '$(resolve_path "${config_ston}")'
   "

repository/SmalltalkCI-Pharo-Core.package/.filetree

@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "IceMetacelloPharoPlatform" }
+	"name" : "IceMetacelloPharoPlatform"
+}

repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/properties.json

@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoCustomScript",
-	"pools" : [
-		 ],
 	"super" : "SCICustomScript",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoCustomScript",
+	"type" : "normal"
+}

repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/properties.json

@@ -1,15 +1,13 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-        "instvars" : [
-	      "registerInIceberg"
-		 ],
-	"name" : "SCIPharoMetacelloLoadSpec",
-	"pools" : [
-		 ],
 	"super" : "SCIMetacelloLoadSpec",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"registerInIceberg"
+	],
+	"name" : "SCIPharoMetacelloLoadSpec",
+	"type" : "normal"
+}

repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/properties.json

@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoMonticelloLoadSpec",
-	"pools" : [
-		 ],
 	"super" : "SCIMonticelloLoadSpec",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoMonticelloLoadSpec",
+	"type" : "normal"
+}

repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/class/runClasses.spec..st

@@ -1,10 +1,23 @@
 running
 runClasses: aCollectionOfClasses spec: aSCISpec
-  | suite classes |
-  suite := TestSuite named: aSCISpec name.
-  classes := (aCollectionOfClasses
-    select: [ :each | (each includesBehavior: TestCase) and: [ each isAbstract not ] ])
-      asSortedCollection: [ :a :b | a name <= b name ].
-  classes
-    do: [ :each | suite addTest: each suite ].
-  ^ self runSuite: suite spec: aSCISpec
+
+	| suite classes resources |
+	suite := TestSuite named: aSCISpec name.
+	classes := (aCollectionOfClasses select: [ :each |
+		            (each includesBehavior: TestCase) and: [
+			            each isAbstract not ] ]) asSortedCollection: [ :a :b |
+		           a name <= b name ].
+
+	resources := OrderedCollection new.
+	classes do: [ :class |
+		| classSuite |
+		classSuite := class suite.
+		resources addAll: (classSuite resources reject: [ :resource |
+				 resources includes: resource ]).
+		"Reset resources of nested suit. Resources are managed by the outermost suite."
+		classSuite resources: #(  ).
+		suite addTest: classSuite ].
+
+	suite resources: resources.
+
+	^ self runSuite: suite spec: aSCISpec

repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/properties.json

@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoTestRunner",
-	"pools" : [
-		 ],
 	"super" : "SCITestRunner",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestRunner",
+	"type" : "normal"
+}

repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/properties.json

@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoTestRunnerPharo10",
-	"pools" : [
-		 ],
 	"super" : "SCIPharoTestRunnerPharo9",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestRunnerPharo10",
+	"type" : "normal"
+}

repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/properties.json

@@ -1,14 +1,15 @@
 {
+	"commentStamp" : "",
+	"super" : "SmalltalkCI",
 	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
+	"classinstvars" : [ ],
+	"pools" : [ ],
 	"classvars" : [
-		"StdOut" ],
-	"commentStamp" : "",
+		"StdOut"
+	],
 	"instvars" : [
-		"suiteName" ],
+		"suiteName"
+	],
 	"name" : "SmalltalkCIPharo",
-	"pools" : [
-		 ],
-	"super" : "SmalltalkCI",
-	"type" : "normal" }
+	"type" : "normal"
+}