Ran update_copyright.py.

[hooke.git] / test / wtk_driver.py

diff --git a/test/wtk_driver.py b/test/wtk_driver.py
index 0953a3a3232ac7506304ead1ac3c19e26283d244..10ea76191a58836a6fc3f2d044bf5d0cb1ffa8ea 100644 (file)
--- a/test/wtk_driver.py
+++ b/test/wtk_driver.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2010-2011 W. Trevor King <wking@drexel.edu>
 #
 # This file is part of Hooke.
 #
@@ -30,7 +30,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 +38,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>