projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30d5d93
)
Update test/ to pass after 8f1ebe298b48.
author
W. Trevor King
<wking@drexel.edu>
Tue, 7 Sep 2010 19:07:02 +0000
(15:07 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Tue, 7 Sep 2010 19:07:02 +0000
(15:07 -0400)
test/block_info.py
patch
|
blob
|
history
test/curve_info.py
patch
|
blob
|
history
test/hemingway_driver.py
patch
|
blob
|
history
test/jpk_driver.py
patch
|
blob
|
history
test/mfp3d_driver.py
patch
|
blob
|
history
test/picoforce_driver.py
patch
|
blob
|
history
test/wtk_driver.py
patch
|
blob
|
history
diff --git
a/test/block_info.py
b/test/block_info.py
index 28780cdd990afdf3bea0152056595077a5f7aacd..5bd81ace360f5f00b79a5ef184aff1a01d1a7cc5 100644
(file)
--- 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
>>> 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',
... % 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:
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
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>
"""
path: .../test/data/picoforce.000
<BLANKLINE>
"""
diff --git
a/test/curve_info.py
b/test/curve_info.py
index 892ef2c746665ca63b075affaa9a96b753f6ea8d..7d0596c91d70acad2889c03ede2dd1af2a7bf41f 100644
(file)
--- 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
>>> 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...>
driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
note: None
command stack: []
blocks: 2
note: None
command stack: []
blocks: 2
diff --git
a/test/hemingway_driver.py
b/test/hemingway_driver.py
index 9b76f79448ed19984cbed8ee14c9883e15345cd3..feaef9d55101f3c32173cdf6a2d6a805a99a4e41 100644
(file)
--- 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
>>> 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...>
driver: <hooke.driver.hemingway.HemingwayDriver object at 0x...>
-filetype: hemingway
note: None
command stack: []
blocks: 1
note: None
command stack: []
blocks: 1
diff --git
a/test/jpk_driver.py
b/test/jpk_driver.py
index a8f4dca885617639fcf66678f4eef2f4ca4fc5ce..c5e8202e87c2e30e39b9961b48110213e630e3e4 100644
(file)
--- 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
>>> 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...>
driver: <hooke.driver.jpk.JPKDriver object at 0x...>
-filetype: jpk
note: None
command stack: []
blocks: 2
note: None
command stack: []
blocks: 2
diff --git
a/test/mfp3d_driver.py
b/test/mfp3d_driver.py
index b40eec924ff815e6758caff77241a3bd34d295a0..b5dfb9efc4fc06fabd4655f1c6548d1150388db8 100644
(file)
--- 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
>>> 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...>
driver: <hooke.driver.mfp3d.MFP3DDriver object at 0x...>
-filetype: mfp3d
note: None
command stack: []
blocks: 3
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
>>> 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...>
driver: <hooke.driver.mfp3d.MFP3DDriver object at 0x...>
-filetype: mfp3d
note: None
command stack: []
blocks: 3
note: None
command stack: []
blocks: 3
diff --git
a/test/picoforce_driver.py
b/test/picoforce_driver.py
index e493d48d23a54b952420e0a22b16206579423913..1d54fed52b6550046e1fa5da701c95eeea73da81 100644
(file)
--- 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
>>> 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...>
driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
note: None
command stack: []
blocks: 2
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
>>> 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...>
driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
note: None
command stack: []
blocks: 2
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
>>> 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...>
driver: <hooke.driver.picoforce.PicoForceDriver object at 0x...>
-filetype: picoforce
note: None
command stack: []
blocks: 2
note: None
command stack: []
blocks: 2
diff --git
a/test/wtk_driver.py
b/test/wtk_driver.py
index 7c62a4be7dcff8051dfc52ec02d67bd782cf802d..c28464430c13cf73025b18932fa34490e088041c 100644
(file)
--- 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
>>> 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...>
driver: <hooke.driver.wtk.WTKDriver object at 0x...>
-filetype: wtk
note: None
command stack: []
blocks: 2
note: None
command stack: []
blocks: 2