X-Git-Url: http://git.tremily.us/?p=hooke.git;a=blobdiff_plain;f=test%2Fwtk_driver.py;h=5c5321ee7a6f79f3cca11ba306454961cfcca10a;hp=0953a3a3232ac7506304ead1ac3c19e26283d244;hb=fd155ef5b2366994f69252c7cd49d46186b62af0;hpb=565f9d7b69d2e4a9ea447d7a50f8f835c3e08642

diff --git a/test/wtk_driver.py b/test/wtk_driver.py
index 0953a3a..5c5321e 100644
--- 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@drexel.edu>
 #
 # 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,7 +29,7 @@ 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.
@@ -38,17 +37,17 @@ Proceed with the test itself.
 >>> r = HookeRunner()
 >>> playlist = os.path.join('test', 'data', 'vclamp_wtk', 'playlist')
 >>> h = r.run_lines(h, ['load_playlist ' + playlist])
-<FilePlaylist playlist.hkp>
+<FilePlaylist WTK>
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 20100504144209_unfold
-path: test/data/vclamp_wtk/unfold/20100504/20100504144209_unfold
-experiment: <class 'hooke.experiment.VelocityClamp'>
+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 names: ['approach', 'retract']
 block sizes: [(810, 2), (8001, 2)]
 Success
 <BLANKLINE>