From e72b6dd20586d0281d6e27e1e12d54fb47a25d38 Mon Sep 17 00:00:00 2001 From: Jenkins Build Server Date: Tue, 7 Mar 2017 08:42:42 +0100 Subject: [PATCH] 60433 19809 Failing test: WeakAnnouncerTest>>#testNoDeadWeakSubscriptions https://pharo.fogbugz.com/f/cases/19809 19799 Nautilus rebuilds the package view twice when adding a new protocol https://pharo.fogbugz.com/f/cases/19799 19810 Non weak announcements in the SystemAnnouncer https://pharo.fogbugz.com/f/cases/19810 http://files.pharo.org/image/60/60433.zip --- .../registerToSystemAnnouncements.st | 2 -- .../instance/accessing/compiledMethod_.st | 7 ++++++- .../{script60432.st => script60433.st} | 14 +++++++------- .../instance/pharo - updates/update60432.st | 12 ------------ .../instance/pharo - updates/update60433.st | 14 ++++++++++++++ .../instance/public/commentForCurrentUpdate.st | 12 ++++++------ .../instance/tests/testNoDeadSubscriptions.st | 12 ++++++++---- .../instance/tests/testOnlyWeakSubscriptions.st | 13 ++++++++----- .../instance/tests/testSaneSubscriptionSize.st | 2 +- 9 files changed, 50 insertions(+), 38 deletions(-) rename ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/{script60432.st => script60433.st} (98%) delete mode 100644 ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60432.st create mode 100644 ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60433.st diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/announcement registration/registerToSystemAnnouncements.st b/Nautilus.package/AbstractNautilusUI.class/instance/announcement registration/registerToSystemAnnouncements.st index 7c59ab3cd2..f3f697cb58 100644 --- a/Nautilus.package/AbstractNautilusUI.class/instance/announcement registration/registerToSystemAnnouncements.st +++ b/Nautilus.package/AbstractNautilusUI.class/instance/announcement registration/registerToSystemAnnouncements.st @@ -20,6 +20,4 @@ registerToSystemAnnouncements when: MethodModified send: #methodModified: to: self; when: MethodRecategorized send: #methodRecategorized: to: self; when: MethodRemoved send: #methodRemoved: to: self; - when: ProtocolAdded send: #classReorganized: to: self; - when: ProtocolRemoved send: #classReorganized: to: self; when: MetalinkChanged send: #metaLinkModified: to: self. diff --git a/Reflectivity.package/ReflectiveMethod.class/instance/accessing/compiledMethod_.st b/Reflectivity.package/ReflectiveMethod.class/instance/accessing/compiledMethod_.st index 1abd7e8861..6857b5c398 100644 --- a/Reflectivity.package/ReflectiveMethod.class/instance/accessing/compiledMethod_.st +++ b/Reflectivity.package/ReflectiveMethod.class/instance/accessing/compiledMethod_.st @@ -1,5 +1,10 @@ compiledMethod: aCompiledMethod + compiledMethod := aCompiledMethod. class := aCompiledMethod methodClass. ast := compiledMethod ast. - SystemAnnouncer uniqueInstance when: ASTCacheReset send: #reinstallASTInCache to: self \ No newline at end of file + + SystemAnnouncer uniqueInstance weak + when: ASTCacheReset + send: #reinstallASTInCache + to: self \ No newline at end of file diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60432.st b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60433.st similarity index 98% rename from ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60432.st rename to ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60433.st index 7414708883..3e77f6d7df 100644 --- a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60432.st +++ b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60433.st @@ -1,4 +1,4 @@ -script60432 +script60433 ^ 'AST-Core-TheIntegrator.492.mcz AST-Tests-Core-TheIntegrator.134.mcz @@ -222,7 +222,7 @@ Multilingual-TextConversion-TheIntegrator.83.mcz Multilingual-TextConverterOtherLanguages-TheIntegrator.4.mcz NECompletion-TheIntegrator.257.mcz NECompletion-Tests-TheIntegrator.10.mcz -Nautilus-TheIntegrator.1354.mcz +Nautilus-TheIntegrator.1357.mcz Nautilus-GroupManager-TheIntegrator.24.mcz Nautilus-GroupManagerUI-TheIntegrator.44.mcz Nautilus-Tests-TheIntegrator.52.mcz @@ -278,7 +278,7 @@ Refactoring-Tests-Critics-TheIntegrator.54.mcz Refactoring-Tests-Environment-TheIntegrator.30.mcz ReflectionMirrors-Primitives-TheIntegrator.9.mcz ReflectionMirrors-Primitives-Tests-TheIntegrator.6.mcz -Reflectivity-TheIntegrator.320.mcz +Reflectivity-TheIntegrator.323.mcz Reflectivity-Examples-TheIntegrator.46.mcz Reflectivity-Tests-TheIntegrator.219.mcz Reflectivity-Tools-TheIntegrator.73.mcz @@ -373,7 +373,7 @@ System-Support-TheIntegrator.1269.mcz System-Support-Rules-TheIntegrator.2.mcz System-SupportTests-TheIntegrator.5.mcz System-VMEvents-TheIntegrator.19.mcz -Tests-TheIntegrator.790.mcz +Tests-TheIntegrator.794.mcz Text-Core-TheIntegrator.66.mcz Text-Diff-TheIntegrator.6.mcz Text-Edition-TheIntegrator.126.mcz @@ -409,9 +409,9 @@ TxText-Styler-HenrikNergaard.18.mcz TxTextTests-Model-SeanDeNigris.29.mcz UIManager-TheIntegrator.195.mcz Unicode-Initialization-TheIntegrator.17.mcz -UnifiedFFI-EstebanLorenzano.96.mcz -UnifiedFFI-Legacy-TheIntegrator.4.mcz -UnifiedFFI-Tests-TheIntegrator.42.mcz +UnifiedFFI-EstebanLorenzano.97.mcz +UnifiedFFI-Legacy-EstebanLorenzano.3.mcz +UnifiedFFI-Tests-EstebanLorenzano.41.mcz UpdateStreamer-Core-TheIntegrator.34.mcz UpdateStreamer-Tests-TheIntegrator.9.mcz Versionner-Commit-TheIntegrator.38.mcz diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60432.st b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60432.st deleted file mode 100644 index b81ab9cbfc..0000000000 --- a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60432.st +++ /dev/null @@ -1,12 +0,0 @@ -update60432 - "self new update60432" - self withUpdateLog: '19808 add timeout and cache per session to catalog - https://pharo.fogbugz.com/f/cases/19808 - -19803 MCSTWriterTest>>#testMethodDefinitionWithBangs failing on bootstrapped image - https://pharo.fogbugz.com/f/cases/19803 - -19811 some methods are wrong in DynamicLoader - https://pharo.fogbugz.com/f/cases/19811'. - self loadTogether: self script60432 merge: false. - self loadConfiguration: 'UnifiedFFI' version: '0.26.5'.self flushCaches. diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60433.st b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60433.st new file mode 100644 index 0000000000..31b91570cc --- /dev/null +++ b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60433.st @@ -0,0 +1,14 @@ +update60433 + "self new update60433" + self withUpdateLog: '19809 Failing test: WeakAnnouncerTest>>#testNoDeadWeakSubscriptions + https://pharo.fogbugz.com/f/cases/19809 + +19799 Nautilus rebuilds the package view twice when adding a new protocol + https://pharo.fogbugz.com/f/cases/19799 + +19810 Non weak announcements in the SystemAnnouncer + https://pharo.fogbugz.com/f/cases/19810'. + self loadTogether: self script60433 merge: false. + +(SystemAnnouncer uniqueInstance subscriptions glmSubscriptions select: [:sub | sub subscriber isNil]) do: #finalize. 3 timesRepeat: [Smalltalk garbageCollect ]. + self flushCaches. diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st index 18aba55be8..612effb427 100644 --- a/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st +++ b/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st @@ -1,9 +1,9 @@ commentForCurrentUpdate - ^ '19808 add timeout and cache per session to catalog - https://pharo.fogbugz.com/f/cases/19808 + ^ '19809 Failing test: WeakAnnouncerTest>>#testNoDeadWeakSubscriptions + https://pharo.fogbugz.com/f/cases/19809 -19803 MCSTWriterTest>>#testMethodDefinitionWithBangs failing on bootstrapped image - https://pharo.fogbugz.com/f/cases/19803 +19799 Nautilus rebuilds the package view twice when adding a new protocol + https://pharo.fogbugz.com/f/cases/19799 -19811 some methods are wrong in DynamicLoader - https://pharo.fogbugz.com/f/cases/19811' \ No newline at end of file +19810 Non weak announcements in the SystemAnnouncer + https://pharo.fogbugz.com/f/cases/19810' \ No newline at end of file diff --git a/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testNoDeadSubscriptions.st b/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testNoDeadSubscriptions.st index c2f1a6b6ac..a30291be0d 100644 --- a/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testNoDeadSubscriptions.st +++ b/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testNoDeadSubscriptions.st @@ -1,8 +1,12 @@ testNoDeadSubscriptions + | dead | + 3 timesRepeat: [ Smalltalk garbageCollect ]. - self deny: ( - (SystemAnnouncer uniqueInstance subscriptions instVarNamed: #subscriptions) anySatisfy: [ :sub | - sub subscriber isNil ] - ) \ No newline at end of file + dead := SystemAnnouncer uniqueInstance + subscriptions subscriptions select: [ :sub | + sub subscriber isNil + ]. + + self assert: dead asArray equals: #() \ No newline at end of file diff --git a/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testOnlyWeakSubscriptions.st b/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testOnlyWeakSubscriptions.st index d33be64f90..950519db53 100644 --- a/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testOnlyWeakSubscriptions.st +++ b/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testOnlyWeakSubscriptions.st @@ -1,9 +1,12 @@ testOnlyWeakSubscriptions - "only weak subscriptions should be allowed to be added to the SystemAnnouncer..." + | strong | + "only weak subscriptions should be allowed to be added to the SystemAnnouncer..." + + strong := SystemAnnouncer uniqueInstance + subscriptions subscriptions reject: [ :each | + each isKindOf: WeakAnnouncementSubscription + ]. - "self assert: ( - (SystemAnnouncer uniqueInstance subscriptions instVarNamed: #subscriptions) - allSatisfy: [ :sub | sub isKindOf: WeakAnnouncementSubscription ] - )" \ No newline at end of file + self assert: strong asArray equals: #() \ No newline at end of file diff --git a/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testSaneSubscriptionSize.st b/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testSaneSubscriptionSize.st index cc601632e1..fdc97e9600 100644 --- a/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testSaneSubscriptionSize.st +++ b/Tests.package/SystemAnnouncerLiveTest.class/instance/tests/testSaneSubscriptionSize.st @@ -1,4 +1,4 @@ testSaneSubscriptionSize - self flag: 'this should be a release test, not a regular one' + "self flag: 'this should be a release test, not a regular one'" "self assert: SystemAnnouncer uniqueInstance subscriptions numberOfSubscriptions < 75." \ No newline at end of file