NotificationsYou must be signed in to change notification settings
Fork752
Star5.1k

Commit59fa6a8

committed

Adjust the import tests to use only commonly available deps

1 parent5cc8faa commit59fa6a8Copy full SHA for 59fa6a8

File tree

2 files changed

+28

-23

lines changed

tests
- conftest.py
- test_module.py

2 files changed

+28

-23

lines changed

`‎tests/conftest.py`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,6 @@ def pytest_configure(config):`
`66`	`66`
`67`	`67`	`importclr`
`68`	`68`	`clr.AddReference("Python.Test")`
`69`		`-clr.AddReference("System")`
`70`		`-clr.AddReference("System.Collections")`
`71`		`-clr.AddReference("System.Data")`
`72`		`-clr.AddReference("System.Xml")`
`73`	`69`
`74`	`70`
`75`	`71`	`defpytest_unconfigure(config):`

`‎tests/test_module.py`

Lines changed: 28 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ def test_import_clr():`
`30`	`30`
`31`	`31`	`deftest_version_clr():`
`32`	`32`	`importclr`
`33`		`-assertclr.__version__>="2.2.0"`
	`33`	`+assertclr.__version__>="3.0.0"`
`34`	`34`
`35`	`35`
`36`	`36`	`deftest_preload_var():`
`@@ -111,12 +111,13 @@ def test_dotted_name_import():`
`111`	`111`
`112`	`112`	`deftest_multiple_dotted_name_import():`
`113`	`113`	`"""Test an import bug with multiple dotted imports."""`
`114`		`-importSystem.Data`
`115`		`-assertis_clr_module(System.Data)`
`116`		`-assertSystem.Data.__name__=='System.Data'`
`117`		`-importSystem.Data`
`118`		`-assertis_clr_module(System.Data)`
`119`		`-assertSystem.Data.__name__=='System.Data'`
	`114`	`+`
	`115`	`+importSystem.Reflection`
	`116`	`+assertis_clr_module(System.Reflection)`
	`117`	`+assertSystem.Reflection.__name__=='System.Reflection'`
	`118`	`+importSystem.Reflection`
	`119`	`+assertis_clr_module(System.Reflection)`
	`120`	`+assertSystem.Reflection.__name__=='System.Reflection'`
`120`	`121`
`121`	`122`
`122`	`123`	`deftest_dotted_name_import_with_alias():`
`@@ -192,11 +193,11 @@ def test_dotted_name_import_from_with_alias():`
`192`	`193`
`193`	`194`	`deftest_from_module_import_star():`
`194`	`195`	`"""Test from module import * behavior."""`
`195`		`-clr.AddReference('System.Xml')`
`196`		`-`
	`196`	`+clr.AddReference("System")`
	`197`	`+`
`197`	`198`	`count=len(locals().keys())`
`198`		`-m=__import__('System.Xml',globals(),locals(), ['*'])`
`199`		`-assertm.__name__=='System.Xml'`
	`199`	`+m=__import__('System',globals(),locals(), ['*'])`
	`200`	`+assertm.__name__=='System'`
`200`	`201`	`assertis_clr_module(m)`
`201`	`202`	`assertlen(locals().keys())>count+1`
`202`	`203`
`@@ -212,7 +213,11 @@ def test_implicit_assembly_load():`
`212`	`213`	`importMicrosoft.Build`
`213`	`214`
`214`	`215`	`withwarnings.catch_warnings(record=True)asw:`
`215`		`-clr.AddReference("System.Windows.Forms")`
	`216`	`+try:`
	`217`	`+clr.AddReference("System.Windows.Forms")`
	`218`	`+exceptException:`
	`219`	`+pytest.skip()`
	`220`	`+`
`216`	`221`	`importSystem.Windows.FormsasForms`
`217`	`222`	`assertis_clr_module(Forms)`
`218`	`223`	`assertForms.__name__=='System.Windows.Forms'`
`@@ -227,11 +232,11 @@ def test_explicit_assembly_load():`
`227`	`232`	`fromSystem.ReflectionimportAssembly`
`228`	`233`	`importSystem,sys`
`229`	`234`
`230`		`-assembly=Assembly.LoadWithPartialName('System.Data')`
	`235`	`+assembly=Assembly.LoadWithPartialName('System.Runtime')`
`231`	`236`	`assertassemblyisnotNone`
`232`	`237`
`233`		`-importSystem.Data`
`234`		`-assert'System.Data'insys.modules`
	`238`	`+importSystem.Runtime`
	`239`	`+assert'System.Runtime'insys.modules`
`235`	`240`
`236`	`241`	`assembly=Assembly.LoadWithPartialName('SpamSpamSpamSpamEggsAndSpam')`
`237`	`242`	`assertassemblyisNone`
`@@ -275,12 +280,14 @@ def test_module_lookup_recursion():`
`275`	`280`
`276`	`281`	`deftest_module_get_attr():`
`277`	`282`	`"""Test module getattr behavior."""`
	`283`	`+`
`278`	`284`	`importSystem`
	`285`	`+importSystem.Runtime`
`279`	`286`
`280`	`287`	`int_type=System.Int32`
`281`	`288`	`assertis_clr_class(int_type)`
`282`	`289`
`283`		`-module=System.Xml`
	`290`	`+module=System.Runtime`
`284`	`291`	`assertis_clr_module(module)`
`285`	`292`
`286`	`293`	`withpytest.raises(AttributeError):`
`@@ -324,7 +331,6 @@ def test_clr_list_assemblies():`
`324`	`331`	`fromclrimportListAssemblies`
`325`	`332`	`verbose=list(ListAssemblies(True))`
`326`	`333`	`short=list(ListAssemblies(False))`
`327`		`-assertu'mscorlib'inshort`
`328`	`334`	`assertu'System'inshort`
`329`	`335`	`assertu'Culture='inverbose[0]`
`330`	`336`	`assertu'Version='inverbose[0]`
`@@ -377,8 +383,11 @@ def test_assembly_load_thread_safety():`
`377`	`383`	`_=Dictionary[Guid,DateTime]()`
`378`	`384`	`ModuleTest.JoinThreads()`
`379`	`385`
	`386`	`+@pytest.mark.skipif()`
`380`	`387`	`deftest_assembly_load_recursion_bug():`
`381`	`388`	`"""Test fix for recursion bug documented in #627"""`
`382`		`-fromSystem.ConfigurationimportConfigurationManager`
`383`		`-content=dir(ConfigurationManager)`
	`389`	`+sys_config=pytest.importorskip(`
	`390`	`+"System.Configuration",reason="System.Configuration can't be imported"`
	`391`	`+ )`
	`392`	`+content=dir(sys_config.ConfigurationManager)`
`384`	`393`	`assertlen(content)>5,content`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit59fa6a8

File tree

2 files changed

2 files changed

`‎tests/conftest.py`

`‎tests/test_module.py`

0 commit comments