Skip to content

Re-enable the domain reload tests #1404

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 7 commits into from
May 3, 2021
Merged

Re-enable the domain reload tests #1404

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f443f0
Re-enable the domain reload tests
BadSingleton Mar 1, 2021
455272f
Empty commit to kick the build
BadSingleton Mar 1, 2021
1c4d5e5
Run domain tests only if domains are not supported
BadSingleton Mar 4, 2021
cd03b85
Move the domain reload tests to the tests directory
BadSingleton Apr 29, 2021
fcea128
Merge the conftest.py files
BadSingleton Apr 29, 2021
badfb32
Merge branch 'master' into fix-1403
BadSingleton Apr 29, 2021
d66a290
Don't run domain reload tests in soft mode, increase timeout
BadSingleton Apr 29, 2021
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
Prev Previous commit
Don't run domain reload tests in soft mode, increase timeout
  • Loading branch information
@BadSingleton
BadSingleton committed Apr 29, 2021
commit d66a290d6cde2cfc857ab945f90f87a25d7074e4
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build-test:
name: Build and Test
runs-on: ${{ matrix.os }}-latest
timeout-minutes: 5
timeout-minutes: 7

strategy:
fail-fast: false
Expand Down
14 changes: 10 additions & 4 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,18 @@ def pytest_configure(config):
import clr
clr.AddReference("Python.Test")

if config.getoption("--runtime") == "netcore":
soft_mode = False
try:
os.environ['PYTHONNET_SHUTDOWN_MODE'] == 'Soft'
except: pass

if config.getoption("--runtime") == "netcore" or soft_mode\
:
collect_ignore.append("domain_tests/test_domain_reload.py")
else:
domain_tests_dir = os.path.join(os.path.dirname(__file__), 'domain_tests')
bin_path = os.path.join(domain_tests_dir, 'bin')
check_call(["dotnet", "build", domain_tests_dir, '-o', bin_path])
domain_tests_dir = os.path.join(os.path.dirname(__file__), "domain_tests")
bin_path = os.path.join(domain_tests_dir, "bin")
check_call(["dotnet", "build", domain_tests_dir, "-o", bin_path])



Expand Down