Issue #16: isolate source of test errors (use of doTransaction while …

…inTransaction) ... fix it and restore some code erroneously removed and cross fingers
dalehenrich · Jan 10, 2015 · 72fa2e0 · 72fa2e0
1 parent a7940ff
commit 72fa2e0
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 14 deletions.
diff --git a/...icationTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/instance/setUp.st b/...icationTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/instance/setUp.st
@@ -1,6 +1,7 @@
 running
 setUp
   super setUp.
-  self gemServerClass register: self gemServerName.
+  (self gemServerClass register: self gemServerName) stopGems.
+  (ObjectLogEntry trace: 'setup: stopGems') addToLog.
   GemServerRemoteTaskExample reset.
   System commitTransaction
diff --git a/...ionTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/methodProperties.json b/...ionTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/methodProperties.json
@@ -7,7 +7,7 @@
 		"gemServerName" : "dkh 12/23/2014 13:28",
 		"runTest:client:task:" : "dkh 01/01/2015 11:17",
 		"scheduledTaskList" : "dkh 12/26/2014 18:17",
-		"setUp" : "dkh 01/09/2015 16:50",
+		"setUp" : "dkh 01/09/2015 17:20",
 		"startGems:" : "dkh 12/23/2014 13:04",
 		"stopGems:" : "dkh 12/23/2014 15:53",
 		"taskList100" : "dkh 01/02/2015 09:20",

diff --git a/...icationTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/instance/setUp.st b/...icationTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/instance/setUp.st
@@ -1,5 +1,5 @@
 running
 setUp
   super setUp.
-  GemServerSeasideStyleExample register: self gemServerName.
+  (GemServerSeasideStyleExample register: self gemServerName) stopGems.
   System commitTransaction
diff --git a/...ionTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/methodProperties.json b/...ionTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/methodProperties.json
@@ -4,7 +4,7 @@
 	"instance" : {
 		"gemServerName" : "dkh 01/02/2015 11:10",
 		"runTest:" : "dkh 01/02/2015 11:45",
-		"setUp" : "dkh 01/09/2015 16:49",
+		"setUp" : "dkh 01/09/2015 17:20",
 		"startGems:" : "dkh 01/02/2015 11:11",
 		"stopGems:" : "dkh 01/02/2015 11:11",
 		"tearDown" : "dkh 01/06/2015 13:42",

diff --git a/repository/GsApplicationTools-ExampleV31.package/monticello.meta/version b/repository/GsApplicationTools-ExampleV31.package/monticello.meta/version
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/logControlEvent..st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/logControlEvent..st
@@ -1,3 +1,7 @@
 private
 logControlEvent: label
-  self doTransaction: [ (ObjectLogEntry info: label object: self) addToLog ]
+  | eventBlock |
+  eventBlock := [ (ObjectLogEntry info: label object: self) addToLog ].
+  System inTransaction
+    ifTrue: [ eventBlock value ]
+    ifFalse: [ self doTransaction: eventBlock ]
diff --git a/...tory/GsApplicationTools-Server.package/GemServer.class/instance/scriptLogEvent.object..st b/...tory/GsApplicationTools-Server.package/GemServer.class/instance/scriptLogEvent.object..st
@@ -1,8 +1,12 @@
 private
 scriptLogEvent: label object: anObject
-  "object log and transcript entries wanted"
+  "object log"
 
+  | eventBlock |
   Transcript
     cr;
     show: 'scriptLogEvent: ' , label printString.
-  self doTransaction: [ (ObjectLogEntry info: label object: anObject) addToLog ]
+  eventBlock := [ (ObjectLogEntry info: label object: anObject) addToLog ].
+  System inTransaction
+    ifTrue: [ eventBlock value ]
+    ifFalse: [ self doTransaction: eventBlock ]
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json b/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json
@@ -83,7 +83,7 @@
 		"interactiveStartServiceOn:transactionMode:" : "dkh 01/06/2015 15:50",
 		"isRunning" : "SebastianHeidbrink 11/02/2014 15:00",
 		"isValidName:" : "dkh 11/26/2014 18:31",
-		"logControlEvent:" : "dkh 12/30/2014 07:24",
+		"logControlEvent:" : "dkh 01/09/2015 17:16",
 		"logDebug:" : "dkh 12/07/2014 10:09",
 		"logInfo:" : "dkh 12/07/2014 10:09",
 		"logStack:titled:" : "dkh 12/27/2014 12:22",
@@ -102,7 +102,7 @@
 		"restartGems" : "dkh 12/06/2014 13:04",
 		"saveContinuationFor:titled:inTransactionDo:" : "dkh 12/30/2014 07:25",
 		"scriptBinDirPath" : "dkh 11/29/2014 09:44",
-		"scriptLogEvent:object:" : "dkh 12/30/2014 07:25",
+		"scriptLogEvent:object:" : "dkh 01/09/2015 17:18",
 		"scriptServicePrologOn:" : "dkh 01/03/2015 22:10",
 		"scriptStartServiceOn:" : "dkh 01/06/2015 15:50",
 		"serverClass" : "dkh 11/29/2014 14:08",

diff --git a/repository/GsApplicationTools-Server.package/monticello.meta/version b/repository/GsApplicationTools-Server.package/monticello.meta/version
diff --git a/repository/GsApplicationTools-Test.package/GemServerTests.class/instance/setUp.st b/repository/GsApplicationTools-Test.package/GemServerTests.class/instance/setUp.st
@@ -3,5 +3,5 @@ setUp
   "(GemServer gemServerNamed: 'Test_Server') stopGems"
 
   super setUp.
-  GemServerTestServer register: self gemServerName.
+  (GemServerTestServer register: self gemServerName) stopGems.
   System commitTransaction
diff --git a/repository/GsApplicationTools-Test.package/GemServerTests.class/methodProperties.json b/repository/GsApplicationTools-Test.package/GemServerTests.class/methodProperties.json
@@ -7,7 +7,7 @@
 		"gemServerName" : "dkh 12/22/2014 11:11",
 		"haltSymbol" : "dkh 12/22/2014 15:43",
 		"internalServerErrorSymbol" : "dkh 12/22/2014 15:18",
-		"setUp" : "dkh 01/09/2015 16:33",
+		"setUp" : "dkh 01/09/2015 17:21",
 		"startGems:" : "dkh 12/22/2014 11:16",
 		"stopGems:" : "dkh 12/22/2014 11:16",
 		"testError" : "dkh 01/09/2015 14:03",

diff --git a/repository/GsApplicationTools-Test.package/monticello.meta/version b/repository/GsApplicationTools-Test.package/monticello.meta/version