Updated test/ to match new pformated command line output.

diff --git a/test/block_info.py b/test/block_info.py
index d3da9208c0059541a4e52f1c5d784419a78bd8c3..28780cdd990afdf3bea0152056595077a5f7aacd 100644 (file)
--- a/test/block_info.py
+++ b/test/block_info.py
@@ -33,20 +33,23 @@ Success
 False
 >>> h = r.run_lines(h, ['block_info --output %s name columns "raw info.file*"'
 ...                     % file_name]) # doctest: +ELLIPSIS, +REPORT_UDIFF
-{'index': 0, 'name': 'approach', 'columns': ['z piezo (m)', 'deflection (m)'], 'raw info': {'filetype': 'picoforce'}}
+{'columns': ['z piezo (m)', 'deflection (m)'],
+ 'index': 0,
+ 'name': 'approach',
+ 'raw info': {'filetype': 'picoforce'}}
 Success
 <BLANKLINE>
 >>> with open(file_name, 'r') as f:
 ...     text = f.read()
 >>> if block_info_already_exists == False:
 ...    os.remove(file_name)
->>> print text
+>>> print text  # doctest: +ELLIPSIS, +REPORT_UDIFF
 picoforce.000:
   approach:
     columns: [z piezo (m), deflection (m)]
     index: 0
     name: approach
     raw info: {filetype: picoforce}
-  path: /tmp/hooke/test/data/picoforce.000
+  path: .../test/data/picoforce.000
 <BLANKLINE>
 """

diff --git a/test/command_stack_save_load.py b/test/command_stack_save_load.py
index 43172d124f17f75ff5c6f515d4441304db91eb12..79afa94d8d81bdc515f1bd4ec3d1cd754d4f04b3 100644 (file)
--- a/test/command_stack_save_load.py
+++ b/test/command_stack_save_load.py
@@ -77,7 +77,7 @@ Success
 ['default']
 >>> with open(os.path.join(target_dir, 'default'), 'r') as f:
 ...     print f.read()
-- arguments: {input: !!python/unicode 'test/data/test'}
+- arguments: {input: test/data/test}
   command: load playlist
 - arguments: {}
   command: get curve
@@ -92,7 +92,7 @@ Success
 ['default', 'my_stack']
 >>> with open(os.path.join(target_dir, 'my_stack'), 'r') as f:
 ...     print f.read()
-- arguments: {input: !!python/unicode 'test/data/test'}
+- arguments: {input: test/data/test}
   command: load playlist
 - arguments: {}
   command: get curve
@@ -114,14 +114,14 @@ Success
 <BLANKLINE>
 >>> with open(os.path.join(target_dir, 'default'), 'r') as f:
 ...     print f.read()
-- arguments: {input: !!python/unicode 'test/data/test'}
+- arguments: {input: test/data/test}
   command: load playlist
 - arguments: {}
   command: get curve
 <BLANKLINE>
 >>> with open(os.path.join(target_dir, 'my_stack'), 'r') as f:
 ...     print f.read()
-- arguments: {input: !!python/unicode 'test/data/test'}
+- arguments: {input: test/data/test}
   command: load playlist
 - arguments: {}
   command: get curve

diff --git a/test/flat_filter_peaks.py b/test/flat_filter_peaks.py
index 87f26e73562aa8e883071b1ce9560b0056d8bcd9..d6687ffe6ad8e71369e1a394f32d3e908597faf2 100644 (file)
--- a/test/flat_filter_peaks.py
+++ b/test/flat_filter_peaks.py
@@ -27,7 +27,7 @@ Success
 >>> h = r.run_lines(h,
 ...     ['zero_surface_contact_point --block retract']
 ...     ) # doctest: +ELLIPSIS, +REPORT_UDIFF
-{'info':...}
+{'active fitted parameters':...}
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['flat_filter_peaks --block retract']

diff --git a/test/polymer_fit.py b/test/polymer_fit.py
index c20ecd7b56cfe49b8c7c5a8897c48348bc5af99b..2920493ca0b0e8e5b3785865189be94cedf40a11 100644 (file)
--- a/test/polymer_fit.py
+++ b/test/polymer_fit.py
@@ -28,8 +28,8 @@ Prepare a curve for polymer fitting.
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['zero_surface_contact_point --block retract']
-...     ) # doctest: +ELLIPSIS, +REPORT_UDIFF
-{'info':...'fitted parameters': [8.413...e-08, 2.812...e-10, 158.581...],...}
+...     ) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE, +REPORT_UDIFF
+{...'fitted parameters': [8.413...e-08, 2.812...e-10, 158.581...],...}
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['polynomial_flatten --block retract --deflection_column "surface deflection (m)" --degree 1'])

diff --git a/test/tutorial.py b/test/tutorial.py
index 558f6cf2b3c111a10224d42e9ba9c50f48551020..a00a7f07e64a6f105eb36e156938c8033120b0f0 100644 (file)
--- a/test/tutorial.py
+++ b/test/tutorial.py
@@ -33,16 +33,15 @@ Documented commands (type help <topic>):
 ========================================
 ...
 >>> h = r.run_lines(h, ['help load_playlist'])
-Command: load_playlist
-<BLANKLINE>
-Arguments:
-<BLANKLINE>
-help BOOL (bool) Print a help message.
-stack BOOL (bool) Add this command to appropriate command stacks.
-output_playlist STRING (string) Name of the new playlist (defaults to
-    an auto-generated name).
-input FILE (file) File name for the input playlist.
-drivers DRIVER (driver) Drivers for loading curves.
+Usage: load_playlist [options]
+<BLANKLINE>
+Options:
+  -h, --help            show this help message and exit
+  --disable-stack       Add this command to appropriate command stacks. (True)
+  --output_playlist=OUTPUT_PLAYLIST
+                        Name of the new playlist (defaults to an auto-
+                        generated name). (None)
+  --drivers=DRIVERS     Drivers for loading curves. (None)
 <BLANKLINE>
 Load a playlist.
 <BLANKLINE>

diff --git a/test/unicode_output.py b/test/unicode_output.py
index 293b80c5a1ea337b6d4b8c2e596237a854bc5af8..55da09f7a64510dde127636d28afbc1ff8642993 100644 (file)
--- a/test/unicode_output.py
+++ b/test/unicode_output.py
@@ -23,7 +23,7 @@ u"""
 >>> h = Hooke()
 >>> r = HookeRunner()
 >>> h = r.run_lines(h, ['help flat_filter_playlist']) # doctest: +REPORT_UDIFF +ELLIPSIS
-Command: flat_filter_playlist...
+Usage: flat_filter_playlist...
       F. Musiani, M. Brucale, L. Bubacco, B. Samorì.
       "Conformational equilibria in monomeric α-Synuclein at the
 ...

diff --git a/test/zero_surface_contact_point.py b/test/zero_surface_contact_point.py
index 69cbbef6369772ecfbb50697b317c3934cf359b8..33249daefdf34ca6050ccc1d18c5118b8aa0ad0c 100644 (file)
--- a/test/zero_surface_contact_point.py
+++ b/test/zero_surface_contact_point.py
@@ -25,8 +25,8 @@
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['zero_surface_contact_point --block retract']
-...     ) # doctest: +ELLIPSIS, +REPORT_UDIFF
-{'info':...'fitted parameters': [8.413...e-08, 2.812...e-10, 158.581...],...}
+...     ) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE, +REPORT_UDIFF
+{...'fitted parameters': [8.413...e-08, 2.812...e-10, 158.581...],...}
 Success
 <BLANKLINE>
 >>> curve = h.playlists.current().current()