Skip to content

New loading based on clr_loader #1373

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
filmor merged 9 commits into from
Feb 14, 2021
Merged

New loading based on clr_loader #1373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b92d929
Replace clr module by loading through clr_loader
filmor Feb 13, 2021
fdb7144
Add Changelog entry
filmor Feb 14, 2021
f01a78c
Fix domain reload tests and activate them on macOS
filmor Feb 13, 2021
0d7e43a
Run tests on .NET Core
filmor Feb 13, 2021
67032ea
Vendor System.Drawing.Point for testing on .NET Core
filmor Feb 14, 2021
8bc458b
Use approximate comparison for single max/min value comparison
filmor Feb 14, 2021
d46fa1e
Adjust the import tests to use only commonly available deps
filmor Feb 14, 2021
f0011a5
Fix PythonTestRunner to work with new pytest setup
filmor Feb 14, 2021
c1a01b7
Drop references to the obsolete call
filmor Feb 14, 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
Next Next commit
Adjust the import tests to use only commonly available deps
  • Loading branch information
@filmor
filmor committed Feb 14, 2021
commit d46fa1e6aa00a291782584018911ee787b0044e5
4 changes: 0 additions & 4 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ def pytest_configure(config):

import clr
clr.AddReference("Python.Test")
clr.AddReference("System")
clr.AddReference("System.Collections")
clr.AddReference("System.Data")
clr.AddReference("System.Xml")


def pytest_unconfigure(config):
Expand Down
47 changes: 28 additions & 19 deletions tests/test_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_import_clr():

def test_version_clr():
import clr
assert clr.__version__ >= "2.2.0"
assert clr.__version__ >= "3.0.0"


def test_preload_var():
Expand Down Expand Up @@ -111,12 +111,13 @@ def test_dotted_name_import():

def test_multiple_dotted_name_import():
"""Test an import bug with multiple dotted imports."""
import System.Data
assert is_clr_module(System.Data)
assert System.Data.__name__ == 'System.Data'
import System.Data
assert is_clr_module(System.Data)
assert System.Data.__name__ == 'System.Data'

import System.Reflection
assert is_clr_module(System.Reflection)
assert System.Reflection.__name__ == 'System.Reflection'
import System.Reflection
assert is_clr_module(System.Reflection)
assert System.Reflection.__name__ == 'System.Reflection'


def test_dotted_name_import_with_alias():
Expand Down Expand Up @@ -192,11 +193,11 @@ def test_dotted_name_import_from_with_alias():

def test_from_module_import_star():
"""Test from module import * behavior."""
clr.AddReference('System.Xml')
clr.AddReference("System")

count = len(locals().keys())
m = __import__('System.Xml', globals(), locals(), ['*'])
assert m.__name__ == 'System.Xml'
m = __import__('System', globals(), locals(), ['*'])
assert m.__name__ == 'System'
assert is_clr_module(m)
assert len(locals().keys()) > count + 1

Expand All @@ -212,7 +213,11 @@ def test_implicit_assembly_load():
import Microsoft.Build

with warnings.catch_warnings(record=True) as w:
clr.AddReference("System.Windows.Forms")
try:
clr.AddReference("System.Windows.Forms")
except Exception:
pytest.skip()

import System.Windows.Forms as Forms
assert is_clr_module(Forms)
assert Forms.__name__ == 'System.Windows.Forms'
Expand All @@ -227,11 +232,11 @@ def test_explicit_assembly_load():
from System.Reflection import Assembly
import System, sys

assembly = Assembly.LoadWithPartialName('System.Data')
assembly = Assembly.LoadWithPartialName('System.Runtime')
assert assembly is not None

import System.Data
assert 'System.Data' in sys.modules
import System.Runtime
assert 'System.Runtime' in sys.modules

assembly = Assembly.LoadWithPartialName('SpamSpamSpamSpamEggsAndSpam')
assert assembly is None
Expand Down Expand Up @@ -275,12 +280,14 @@ def test_module_lookup_recursion():

def test_module_get_attr():
"""Test module getattr behavior."""

import System
import System.Runtime

int_type = System.Int32
assert is_clr_class(int_type)

module = System.Xml
module = System.Runtime
assert is_clr_module(module)

with pytest.raises(AttributeError):
Expand Down Expand Up @@ -324,7 +331,6 @@ def test_clr_list_assemblies():
from clr import ListAssemblies
verbose = list(ListAssemblies(True))
short = list(ListAssemblies(False))
assert u'mscorlib' in short
assert u'System' in short
assert u'Culture=' in verbose[0]
assert u'Version=' in verbose[0]
Expand Down Expand Up @@ -377,8 +383,11 @@ def test_assembly_load_thread_safety():
_ = Dictionary[Guid, DateTime]()
ModuleTest.JoinThreads()

@pytest.mark.skipif()
def test_assembly_load_recursion_bug():
"""Test fix for recursion bug documented in #627"""
from System.Configuration import ConfigurationManager
content = dir(ConfigurationManager)
sys_config = pytest.importorskip(
"System.Configuration", reason="System.Configuration can't be imported"
)
content = dir(sys_config.ConfigurationManager)
assert len(content) > 5, content