|
|
|
|
708
|
start = time.time()
|
708
|
start = time.time()
|
709
|
try:
|
709
|
try:
|
710
|
self._get_data() # run the test, i.e. obtain raw data
|
710
|
self._get_data() # run the test, i.e. obtain raw data
|
711
|
- except StandardError as e:
|
|
|
|
|
711
|
+ except Exception as e:
|
712
|
raise DriverError(e, self)
|
712
|
raise DriverError(e, self)
|
713
|
self.duration = (time.time() - start if self.duration is None
|
713
|
self.duration = (time.time() - start if self.duration is None
|
714
|
else self.duration)
|
714
|
else self.duration)
|
|
|
|
|
716
|
self._decode_data() # decode raw data
|
716
|
self._decode_data() # decode raw data
|
717
|
self._normalize_data() # normalize decoded data
|
717
|
self._normalize_data() # normalize decoded data
|
718
|
self._check_data() # perform arbitrarty checking
|
718
|
self._check_data() # perform arbitrarty checking
|
719
|
- except StandardError, e:
|
|
|
|
|
719
|
+ except Exception as e:
|
720
|
raise DriverDataError(e, self)
|
720
|
raise DriverDataError(e, self)
|
721
|
self.__cleanup_data() # cleanup (remove data['_*'])
|
721
|
self.__cleanup_data() # cleanup (remove data['_*'])
|
722
|
|
722
|
|