Update test/ with new 'block names' in 'curve info' (from 3371b5652dfe).

[hooke.git] / test / picoforce_driver.py

diff --git a/test/picoforce_driver.py b/test/picoforce_driver.py
index a40ade7e82e4fdb8a6d9eaed369014f90a23fa55..e493d48d23a54b952420e0a22b16206579423913 100644 (file)
--- a/test/picoforce_driver.py
+++ b/test/picoforce_driver.py
@@ -2,15 +2,15 @@
 #
 # This file is part of Hooke.
 #
-# Hooke is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation, either
-# version 3 of the License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
 #
-# Hooke is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with Hooke.  If not, see
@@ -23,17 +23,19 @@
 >>> r = HookeRunner()
 >>> playlist = os.path.join('test', 'data', 'vclamp_picoforce', 'playlist')
 >>> h = r.run_lines(h, ['load_playlist ' + playlist])
-<FilePlaylist playlist.hkp>
+<FilePlaylist PicoForce>
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 20071120a_i27_t33.100
-path: test/data/vclamp_picoforce/20071120a_i27_t33.100
-experiment: <class 'hooke.experiment.VelocityClamp'>
+path: .../test/data/vclamp_picoforce/20071120a_i27_t33.100
+experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
 filetype: picoforce
-note: 
+note: None
+command stack: []
 blocks: 2
+block names: ['approach', 'retract']
 block sizes: [(2048, 2), (2048, 2)]
 Success
 <BLANKLINE>
@@ -45,12 +47,14 @@ Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 0x07200000
-path: test/data/vclamp_picoforce/0x07200000
-experiment: <class 'hooke.experiment.VelocityClamp'>
+path: .../test/data/vclamp_picoforce/0x07200000
+experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
 filetype: picoforce
-note: 
+note: None
+command stack: []
 blocks: 2
+block names: ['approach', 'retract']
 block sizes: [(512, 2), (512, 2)]
 Success
 <BLANKLINE>
@@ -59,12 +63,14 @@ Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 0x06130001
-path: test/data/vclamp_picoforce/0x06130001
-experiment: <class 'hooke.experiment.VelocityClamp'>
+path: .../test/data/vclamp_picoforce/0x06130001
+experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
 filetype: picoforce
-note: 
+note: None
+command stack: []
 blocks: 2
+block names: ['approach', 'retract']
 block sizes: [(2048, 2), (2048, 2)]
 Success
 <BLANKLINE>