Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix Pyobject GC Finalize & Enable NUnit Exit Code #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 8, 2017
Merged

Fix Pyobject GC Finalize & Enable NUnit Exit Code #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75dd544
Turn on NUNIT exit code
vmuriart Feb 7, 2017
c69297e
Fix GC on PyObject during Finalizing
vmuriart Feb 8, 2017
c954442
Update CHANGELOG
vmuriart Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions ci/appveyor_run_tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/runtime/pyobject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down