Commiteb2b492

Rory Yorke

committed

Replace test decorator cvxoptonly with pytest mark cvxopt

The pytest marker cvxopt is equivalent to the cvxoptonly decorator,and also allows cvxopt tests to be included or excluded at the pytestcommand-line.

1 parent4be4767 commiteb2b492Copy full SHA for eb2b492

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@ def pytest_runtest_setup(item):`
`15`	`15`	`formarkinitem.iter_markers())):`
`16`	`16`	`pytest.skip("slycot not installed")`
`17`	`17`
	`18`	`+if (notcontrol.exception.cvxopt_check()`
	`19`	`+andany(mark.name=='cvxopt'`
	`20`	`+formarkinitem.iter_markers())):`
	`21`	`+pytest.skip("cvxopt not installed")`
	`22`	`+`
`18`	`23`
`19`	`24`	`@pytest.fixture(scope="session",autouse=True)`
`20`	`25`	`defcontrol_defaults():`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,9 @@`
`5`	`5`	`importpytest`
`6`	`6`	`importnumpy`
`7`	`7`	`fromcontrolimportss,passivity,tf,sample_system,parallel,feedback`
`8`		`-fromcontrol.tests.conftestimportcvxoptonly`
`9`	`8`	`fromcontrol.exceptionimportControlArgument,ControlDimension`
`10`	`9`
`11`		`-pytestmark=cvxoptonly`
	`10`	`+pytestmark=pytest.mark.cvxopt`
`12`	`11`
`13`	`12`
`14`	`13`	`deftest_ispassive_ctime():`

Lines changed: 1 addition & 0 deletions

Comments

(0)