kasli_tester: cleanup/fix test skipping

This commit is contained in:
Sebastien Bourdeauducq 2019-06-21 16:00:10 +08:00
parent b8b9fa51bd
commit f6edceb23d
1 changed files with 34 additions and 29 deletions

View File

@ -323,7 +323,6 @@ class KasliTester(EnvExperiment):
zotino.load() zotino.load()
def test_zotinos(self): def test_zotinos(self):
if self.zotinos:
print("*** Testing Zotino DACs.") print("*** Testing Zotino DACs.")
print("Voltages:") print("Voltages:")
for card_n, (card_name, card_dev) in enumerate(self.zotinos): for card_n, (card_name, card_dev) in enumerate(self.zotinos):
@ -354,7 +353,6 @@ class KasliTester(EnvExperiment):
print("ROI sums:", n) print("ROI sums:", n)
def test_grabbers(self): def test_grabbers(self):
if self.grabbers:
print("*** Testing Grabber Frame Grabbers.") print("*** Testing Grabber Frame Grabbers.")
print("Activate the camera's frame grabber output, type 'g', press " print("Activate the camera's frame grabber output, type 'g', press "
"ENTER, and trigger the camera.") "ENTER, and trigger the camera.")
@ -372,10 +370,17 @@ class KasliTester(EnvExperiment):
print("****** Kasli system tester ******") print("****** Kasli system tester ******")
print("") print("")
self.core.reset() self.core.reset()
if self.leds:
self.test_leds() self.test_leds()
if self.ttl_outs:
self.test_ttl_outs() self.test_ttl_outs()
if self.ttl_ins:
self.test_ttl_ins() self.test_ttl_ins()
if self.urukuls:
self.test_urukuls() self.test_urukuls()
if self.samplers:
self.test_samplers() self.test_samplers()
if self.zotinos:
self.test_zotinos() self.test_zotinos()
if self.grabbers:
self.test_grabbers() self.test_grabbers()