Commit0320595

authored

Merge pull request#537 from bnavigator/pytest-timeout

Use pytest-timeout for rlocus test

2 parents3adc610 +25114f5 commit0320595Copy full SHA for 0320595

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ jobs:`
`19`	`19`	`sudo apt install -y xvfb`
`20`	`20`
`21`	`21`	`# Install test tools`
`22`		`- conda install pip pytest`
	`22`	`+ conda install pip pytest pytest-timeout`
`23`	`23`
`24`	`24`	`# Install python-control dependencies`
`25`	`25`	`conda install numpy matplotlib scipy`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ jobs:`
`32`	`32`	`sudo apt install -y xvfb`
`33`	`33`
`34`	`34`	`# Install test tools`
`35`		`- conda install pip coverage pytest`
	`35`	`+ conda install pip coverage pytest pytest-timeout`
`36`	`36`	`pip install coveralls`
`37`	`37`
`38`	`38`	`# Install python-control dependencies`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ def test_root_locus_zoom(self):`
`76`	`76`	`assert_array_almost_equal(zoom_x,zoom_x_valid)`
`77`	`77`	`assert_array_almost_equal(zoom_y,zoom_y_valid)`
`78`	`78`
	`79`	`+@pytest.mark.timeout(2)`
`79`	`80`	`deftest_rlocus_default_wn(self):`
`80`	`81`	`"""Check that default wn calculation works properly"""`
`81`	`82`	`#`
`@@ -94,12 +95,5 @@ def test_rlocus_default_wn(self):`
`94`	`95`	`sys=ct.tf(*sp.signal.zpk2tf(`
`95`	`96`	`[-1e-2,1-1e7j,1+1e7j], [0,-1e7j,1e7j],1))`
`96`	`97`
`97`		`-# Set up a timer to catch execution time`
`98`		`-defsignal_handler(signum,frame):`
`99`		`-raiseException("rlocus took too long to complete")`
`100`		`-signal.signal(signal.SIGALRM,signal_handler)`
`101`		`-`
`102`		`-# Run the command and reset the alarm`
`103`		`-signal.alarm(2)# 2 second timeout`
`104`	`98`	`ct.root_locus(sys)`
`105`		`-signal.alarm(0)# reset the alarm`
	`99`	`+`

Lines changed: 3 additions & 0 deletions

Comments

(0)