Merge pull request #365 from vmuriart/pyobject_finalize

vmuriart · web-flow · commit 8afd5125e5d7 · 2017-02-08T09:39:48.000-07:00
Fix Pyobject GC Finalize &amp; Enable NUnit Exit Code
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Code Coverage (#345)
 -   Added `pysetargv` (#347)
 -   Added XML Documentation (#349)
+-   Added Embedded tests on Appveyor (#353)
 -   Added PY3 settings to configuration-manager (#346)
 
 ### Changed
@@ -21,11 +22,11 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Completed refactor of Build Directives on `Runtime.cs` (#339)
 -   Refactor python unittests (#329)
 -   Unfroze Mono version on Travis (#345)
--   Enabled Embedded tests on Appveyor (#353)
 
 ### Fixed
 
--   Fixed crash during Shutdown (#343)
+-   Fixed crash during Initialization (#343)
+-   Fixed crash during Shutdown (#365)
 
 ### Removed
 
diff --git a/ci/appveyor_run_tests.ps1 b/ci/appveyor_run_tests.ps1
@@ -26,8 +26,7 @@ if ($NUNIT_STATUS -ne 0) {
 }
 
 # Embedded tests failing due to open issues, pass/fail only on Python exit code
-# if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) {
-if ($PYTHON_STATUS -ne 0) {
+if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) {
     Write-Host "Tests failed" -ForegroundColor "Red"
     $host.SetShouldExit(1)
 }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -113,7 +113,7 @@ protected virtual void Dispose(bool disposing)
         {
             if (!disposed)
             {
-                if (Runtime.Py_IsInitialized() > 0)
+                if (Runtime.Py_IsInitialized() > 0 && !Runtime.IsFinalizing)
                 {
                     IntPtr gs = PythonEngine.AcquireLock();
                     Runtime.XDecref(obj);

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ if ($NUNIT_STATUS -ne 0) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`# Embedded tests failing due to open issues, pass/fail only on Python exit code`
`29`		`-# if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) {`
`30`		`-if ($PYTHON_STATUS -ne 0) {`
	`29`	`+if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) {`
`31`	`30`	`Write-Host "Tests failed" -ForegroundColor "Red"`
`32`	`31`	`$host.SetShouldExit(1)`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ protected virtual void Dispose(bool disposing)`
`113`	`113`	`{`
`114`	`114`	`if (!disposed)`
`115`	`115`	`{`
`116`		`- if (Runtime.Py_IsInitialized() > 0)`
	`116`	`+ if (Runtime.Py_IsInitialized() > 0 && !Runtime.IsFinalizing)`
`117`	`117`	`{`
`118`	`118`	`IntPtr gs = PythonEngine.AcquireLock();`
`119`	`119`	`Runtime.XDecref(obj);`