Skip to content

Commit

Permalink
RF: work around strange test failure on travis
Browse files Browse the repository at this point in the history
getting an import error under travis-ci within a test that looks like it should not be run at all under travis-ci
unclear why recent changes should have anything to do with this.
  • Loading branch information
jeremygray committed Dec 5, 2015
1 parent dad254c commit 11489ab
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion psychopy/tests/test_hardware/test_CRS_BitsSharp.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
win = visual.Window(screen=1, fullscr=True, useFBO=True, autoLog=True)
win.setGamma(1.0) #make sure gfx card LUT is identity
#initialise BitsSharp
bits = crs.BitsSharp(win=win, mode='color++')
try:
bits = crs.BitsSharp(win=win, mode='color++')
except ImportError:
pytest.skip("crs.BitsSharp: could not initialize. possible:\nfrom serial.tools import list_ports\n"
"ImportError: No module named tools")
if not bits.OK:
win.close()
pytest.skip("No BitsSharp connected")
Expand Down

0 comments on commit 11489ab

Please sign in to comment.