From: W. Trevor King <wking@drexel.edu>
Date: Mon, 14 Jun 2010 15:05:53 +0000 (-0400)
Subject: Adjust test/wtk_driver.py since I didn't add all my original files.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ac93ca63ba0ab31d17f6206e497d580d7c10ddd;p=hooke.git

Adjust test/wtk_driver.py since I didn't add all my original files.
---

diff --git a/hooke/driver/picoforce.py b/hooke/driver/picoforce.py
index a465c2e..4ca9c5f 100644
--- a/hooke/driver/picoforce.py
+++ b/hooke/driver/picoforce.py
@@ -292,12 +292,13 @@ class PicoForceDriver (Driver):
         #    raise NotImplementedError(
         #        'Missmatched duplicate traces for %s: %s'
         #        % (trace_name, ', '.join(msg)))
-        import sys
+        import logging
+        log = logging.getLogger('hooke')
         for name,t in traces.items():
             if (t == trace).all():
-                print >> sys.stderr, 'replace %s with %s-2' % (name, trace_name)
+                log.debug('replace %s with %s-2' % (name, trace_name))
                 return name  # Replace this identical dataset.
-        print >> sys.stderr, 'store %s-2 as Other' % (trace_name)
+        log.debug('store %s-2 as Other' % (trace_name))
         return 'Other'
         # return None
 
diff --git a/test/wtk_driver.py b/test/wtk_driver.py
index f570bc9..bf2af11 100644
--- a/test/wtk_driver.py
+++ b/test/wtk_driver.py
@@ -42,14 +42,14 @@ Proceed with the test itself.
 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
+name: 20100504144209_unfold
+path: test/data/vclamp_wtk/unfold/20100504/20100504144209_unfold
 experiment: <class 'hooke.experiment.VelocityClamp'>
 driver: <hooke.driver.wtk.WTKDriver object at 0x...>
 filetype: wtk
 note: 
 blocks: 2
-block sizes: [(16001, 3), (16001, 3)]
+block sizes: [(810, 2), (8001, 2)]
 Success
 <BLANKLINE>
 """