Skip to content

Commit 4c2df1b

Browse files
committed
Enable test_memory
1 parent 1de7096 commit 4c2df1b

3 files changed

Lines changed: 2 additions & 7 deletions

File tree

src/core/IronPython/Runtime/Types/PythonType.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2498,6 +2498,7 @@ private void AddSubType(PythonType subtype) {
24982498
}
24992499

25002500
lock (_subtypesLock) {
2501+
_subtypes.RemoveAll(x => !x.TryGetTarget(out _)); // remove dead entries
25012502
_subtypes.Add(new WeakReference<PythonType>(subtype));
25022503
}
25032504
}

tests/IronPython.Tests/Cases/IronPythonCasesManifest.ini

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ Reason=New test needs to be written for new csharp version
6565
Ignore=true
6666
Reason=Assertion error
6767

68-
[IronPython.test_memory]
69-
#RunCondition=NOT $(IS_POSIX)
70-
#Reason=Memory allocation on Mono may not match MS.NET
71-
Ignore=true
72-
Reason=Fails intermittently - https://github.com/IronLanguages/ironpython3/issues/508
73-
7468
[IronPython.test_number]
7569
Timeout=300000 # 5 minute timeout - slow on macOS
7670

tests/suite/test_memory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ def setUp(self):
8282
from Microsoft.Scripting.Generation import Snippets
8383

8484
self.skipMemoryCheck = Snippets.Shared.SaveSnippets or clr.GetCurrentRuntime().Configuration.DebugMode
85-
self.expectedMem = 24000
8685

8786
# account for adaptive compilation
87+
self.expectedMem = 24000
8888
if is_cli64:
8989
self.expectedMem = int(self.expectedMem*1.25)
9090

0 commit comments

Comments
 (0)