From: W. Trevor King <wking@drexel.edu>
Date: Tue, 7 Sep 2010 19:07:02 +0000 (-0400)
Subject: Update test/ to pass after 8f1ebe298b48.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eff60a7949a966036d8c11e022fa6ffe0d91d059;p=hooke.git

Update test/ to pass after 8f1ebe298b48.
---

diff --git a/test/block_info.py b/test/block_info.py
index 28780cd..5bd81ac 100644
--- a/test/block_info.py
+++ b/test/block_info.py
@@ -31,12 +31,12 @@ Success
 >>> block_info_already_exists = os.path.exists(file_name)
 >>> block_info_already_exists
 False
->>> h = r.run_lines(h, ['block_info --output %s name columns "raw info.file*"'
+>>> h = r.run_lines(h, ['block_info --output %s name columns "raw info.Scanner list.Serial n*"'
 ...                     % file_name]) # doctest: +ELLIPSIS, +REPORT_UDIFF
 {'columns': ['z piezo (m)', 'deflection (m)'],
  'index': 0,
  'name': 'approach',
- 'raw info': {'filetype': 'picoforce'}}
+ 'raw info': {'Scanner list': {'Serial number': '196PF'}}}
 Success
 <BLANKLINE>
 >>> with open(file_name, 'r') as f:
@@ -49,7 +49,8 @@ picoforce.000:
     columns: [z piezo (m), deflection (m)]
     index: 0
     name: approach
-    raw info: {filetype: picoforce}
+    raw info:
+      Scanner list: {Serial number: 196PF}
   path: .../test/data/picoforce.000
 <BLANKLINE>
 """
diff --git a/test/curve_info.py b/test/curve_info.py
index 892ef2c..7d0596c 100644
--- a/test/curve_info.py
+++ b/test/curve_info.py
@@ -27,9 +27,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: picoforce.000
 path: .../test/data/picoforce.000
-experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
 note: None
 command stack: []
 blocks: 2
diff --git a/test/hemingway_driver.py b/test/hemingway_driver.py
index 9b76f79..feaef9d 100644
--- a/test/hemingway_driver.py
+++ b/test/hemingway_driver.py
@@ -29,9 +29,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 20080428_a53t-0-0-10.dat
 path: .../test/data/fclamp_hemingway/20080428_a53t-0-0-10.dat
-experiment: <hooke.experiment.ForceClamp object at 0x...>
 driver: <hooke.driver.hemingway.HemingwayDriver object at 0x...>
-filetype: hemingway
 note: None
 command stack: []
 blocks: 1
diff --git a/test/jpk_driver.py b/test/jpk_driver.py
index a8f4dca..c5e8202 100644
--- a/test/jpk_driver.py
+++ b/test/jpk_driver.py
@@ -29,9 +29,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 2009.04.23-15.15.47.jpk
 path: .../test/data/vclamp_jpk/2009.04.23-15.15.47.jpk
-experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.jpk.JPKDriver object at 0x...>
-filetype: jpk
 note: None
 command stack: []
 blocks: 2
diff --git a/test/mfp3d_driver.py b/test/mfp3d_driver.py
index b40eec9..b5dfb9e 100644
--- a/test/mfp3d_driver.py
+++ b/test/mfp3d_driver.py
@@ -29,9 +29,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: Line0004Point0000.ibw
 path: .../test/data/vclamp_mfp3d/Line0004Point0000.ibw
-experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.mfp3d.MFP3DDriver object at 0x...>
-filetype: mfp3d
 note: None
 command stack: []
 blocks: 3
@@ -48,9 +46,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: Image0396.ibw
 path: .../test/data/vclamp_mfp3d/Image0396.ibw
-experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.mfp3d.MFP3DDriver object at 0x...>
-filetype: mfp3d
 note: None
 command stack: []
 blocks: 3
diff --git a/test/picoforce_driver.py b/test/picoforce_driver.py
index e493d48..1d54fed 100644
--- a/test/picoforce_driver.py
+++ b/test/picoforce_driver.py
@@ -29,9 +29,7 @@ Success
 >>> 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: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
 note: None
 command stack: []
 blocks: 2
@@ -48,9 +46,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 0x07200000
 path: .../test/data/vclamp_picoforce/0x07200000
-experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
 note: None
 command stack: []
 blocks: 2
@@ -64,9 +60,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 0x06130001
 path: .../test/data/vclamp_picoforce/0x06130001
-experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
 note: None
 command stack: []
 blocks: 2
diff --git a/test/wtk_driver.py b/test/wtk_driver.py
index 7c62a4b..c284644 100644
--- a/test/wtk_driver.py
+++ b/test/wtk_driver.py
@@ -44,9 +44,7 @@ Success
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 20100504144209_unfold
 path: .../test/data/vclamp_wtk/unfold/20100504/20100504144209_unfold
-experiment: <hooke.experiment.VelocityClamp object at 0x...>
 driver: <hooke.driver.wtk.WTKDriver object at 0x...>
-filetype: wtk
 note: None
 command stack: []
 blocks: 2