Ran update-copyright.py

[hooke.git] / test / wtk_driver.py

diff --git a/test/wtk_driver.py b/test/wtk_driver.py
index b8f7e691ed364886d1f095376ae6f344246323c0..02591f1b88ee0b053c800624fedbff012b1c3107 100644 (file)
--- a/test/wtk_driver.py
+++ b/test/wtk_driver.py
@@ -1,20 +1,19 @@
-# Copyright (C) 2010 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2010-2012 W. Trevor King <wking@tremily.us>
 #
 # 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
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with Hooke.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Point data_logger to our test data.
@@ -30,25 +29,26 @@ Adjust Hooke in case we don't have calibcant installed.
 >>> from hooke.hooke import Hooke, HookeRunner
 >>> h = Hooke()
 >>> h.config.set('wtk driver', 'cantilever calibration directory',
-...              '$DEFAULT$/calibrate_cantilever')
+...              '${DEFAULT}/calibrate_cantilever')
 >>> h.load_drivers()
 
 Proceed with the test itself.
 
 >>> r = HookeRunner()
->>> h = r.run_lines(h, ['load_playlist test/data/vclamp_wtk/playlist']) # doctest: +ELLIPSIS
-<FilePlaylist playlist.hkp>
+>>> playlist = os.path.join('test', 'data', 'vclamp_wtk', 'playlist')
+>>> h = r.run_lines(h, ['load_playlist ' + playlist])
+<FilePlaylist WTK>
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
-name: 20100504135237_unfold
-path: test/data/vclamp_wtk/unfold/20100504/20100504135237_unfold
-experiment: <class 'hooke.experiment.VelocityClamp'>
+name: 20100504144209_unfold
+path: .../test/data/vclamp_wtk/unfold/20100504/20100504144209_unfold
 driver: <hooke.driver.wtk.WTKDriver object at 0x...>
-filetype: wtk
-note: 
+note: None
+command stack: []
 blocks: 2
-block sizes: [(16001, 3), (16001, 3)]
+block names: ['approach', 'retract']
+block sizes: [(810, 2), (8001, 2)]
 Success
 <BLANKLINE>
 """