Skip to content

Commit d711b28

Browse files
committed
Enable test_memory
1 parent bd7c7b4 commit d711b28

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

Src/IronPython/Runtime/Types/PythonType.cs

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

24932493
lock (_subtypesLock) {
2494+
_subtypes.RemoveAll(x => !x.TryGetTarget(out _)); // remove dead entries
24942495
_subtypes.Add(new WeakReference<PythonType>(subtype));
24952496
}
24962497
}

Src/IronPythonTest/Cases/IronPythonCasesManifest.ini

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

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

Tests/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)