Commit edc7621
authored
Fix PythonException GC (pythonnet#400)
Since PythonException doesn't inherit from PyObject, need to reapply
the same fix as from gh:365.
Seen mostly on PY27/Travis on PyTuple tests.
Enable PyTuple tests for PY27/Travis1 parent d86880a commit edc7621
2 files changed
Lines changed: 1 addition & 24 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,29 +6,6 @@ namespace Python.EmbeddingTest | |||
| 6 | 6 | { | |
| 7 | 7 | public class PyTupleTest | |
| 8 | 8 | { | |
| 9 | - /// <summary> | ||
| 10 | - /// Tests set-up. Being used to skip class on Travis/PY27 | ||
| 11 | - /// </summary> | ||
| 12 | - /// <remarks> | ||
| 13 | - /// FIXME: Fails on Travis/PY27: All tests below (unless otherwise stated) | ||
| 14 | - /// Fatal Python error: auto-releasing thread-state, but no thread-state for this thread | ||
| 15 | - /// Stacktrace: | ||
| 16 | - /// at (wrapper managed-to-native) Python.Runtime.Runtime.PyGILState_Release (intptr) | ||
| 17 | - /// at Python.Runtime.PythonEngine.ReleaseLock (intptr) | ||
| 18 | - /// at Python.Runtime.PythonException.Dispose () | ||
| 19 | - /// at Python.Runtime.PythonException.Finalize () | ||
| 20 | - /// at (wrapper runtime-invoke) object.runtime_invoke_virtual_void__this__ (object,intptr,intptr,intptr) | ||
| 21 | - /// </remarks> | ||
| 22 | - [SetUp] | ||
| 23 | - public void SetUp() | ||
| 24 | - { | ||
| 25 | - if (Environment.GetEnvironmentVariable("TRAVIS") == "true" && | ||
| 26 | - Environment.GetEnvironmentVariable("TRAVIS_PYTHON_VERSION") == "2.7") | ||
| 27 | - { | ||
| 28 | - Assert.Ignore("Fails on Travis/PY27: Fatal Python error: auto-releasing thread-state, but no thread-state for this thread"); | ||
| 29 | - } | ||
| 30 | - } | ||
| 31 | - | ||
| 32 | 9 | /// <summary> | |
| 33 | 10 | /// Test IsTupleType without having to Initialize a tuple. | |
| 34 | 11 | /// PyTuple constructor use IsTupleType. This decouples the tests. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -140,7 +140,7 @@ public void Dispose() | |||
| 140 | 140 | { | |
| 141 | 141 | if (!disposed) | |
| 142 | 142 | { | |
| 143 | - if (Runtime.Py_IsInitialized() > 0) | ||
| 143 | + if (Runtime.Py_IsInitialized() > 0 && !Runtime.IsFinalizing) | ||
| 144 | 144 | { | |
| 145 | 145 | IntPtr gs = PythonEngine.AcquireLock(); | |
| 146 | 146 | Runtime.XDecref(_pyType); | |
0 commit comments