Restore HART tests by fixing enip_format call (and fix indentation)

Author: pjkundert

server/enip/hart_test.py

@@ -286,7 +286,7 @@ def hart_pass_thru( io, path, hart_data, data_size, route_path=None ):
 # 
 # Since we implemented STRUCT tags, we need to update the HART implementation.
 # 
-@pytest.mark.xfail
+#@pytest.mark.xfail
 def test_hart_pass_thru_poll( simulated_hart_gateway ):
     r"""To test a remote C*Logix w/ a HART card, set up a remote port forward from another host in the
     same LAN.  Here's a windows example, using putty.  This windows machine (at 100.100.102.1)
@@ -376,12 +376,12 @@ def test_hart_pass_thru_poll( simulated_hart_gateway ):
             hio, path=path, hart_data=[3, 0], route_path=route_path, data_size=4*4 ) # with no size
 
         # small response carries PV, SV, TV, FV values, no data types
-        value			= []
+        value			= cpppo.dotdict( current=[] )
         if data and len( data ) == 4*4:
             # Short
             packer		= struct.Struct( enip.REAL_network.struct_format )
             for i in range( 0, len( data ), 4 ):
-                value		+= packer.unpack_from( buffer=bytearray( data[i:i+4] ))
+                value.current	+= packer.unpack_from( buffer=bytearray( data[i:i+4] ))
         elif data and len( data ) >= 24:
             # Long
             packer		= struct.Struct( enip.REAL_network.struct_format )
@@ -580,7 +580,7 @@ def test_hart_pass_thru_poll( simulated_hart_gateway ):
              ),
 ]
 
-#@pytest.mark.xfail
+
 def test_CIP_hart( repeat=1 ):
     """HART protocol enip CIP messages
     """

server/enip/parser.py

@@ -651,62 +651,64 @@ def enip_format( data, sort_keys=False, indent=4 ):
     enip_format attempting to decode str as utf-8.
 
     """
-    pairs		= data.items()
+    assert isinstance( data, dict ), \
+        "Unknown data type {data!r}".format( data=data )
+    pairs			= data.items()
     if sort_keys:
-        pairs		= sorted( pairs )
-    prefix		= ' ' * indent
-    newline		= '\n' + prefix
-    result		= '{'
+        pairs			= sorted( pairs )
+    prefix			= ' ' * indent
+    newline			= '\n' + prefix
+    result			= '{'
     for key,val in pairs:
-        result	       += newline + "{key:32}".format( key=repr( key ) + ': ' )
+        result		       += newline + "{key:32}".format( key=repr( key ) + ': ' )
         if isinstance( val, bytes ) and sys.version_info[0] < 3: # Python2: str; very ambiguous
             if not any( c < ' ' or c > '~' for c in val ):
                 result += repr( val ) + ',' # '...',
                 continue
             try:
                 if not any( c < ' ' for c in val ):
-                    result += repr( val.decode( 'utf-8' )) + ',' # Python2: u"...", Python3: "..."
+                    result     += repr( val.decode( 'utf-8' )) + ',' # Python2: u"...", Python3: "..."
                     continue
             except:
                 pass
             # Probably binary data in bytes; fall thru...
         try:
-            binary	= octets_encode( val )
+            binary		= octets_encode( val )
         except:
             pass
         else:
             # Yes, some binary data container
             if isinstance( val, array.array ):
-                beg,end	= 'array( {val.typecode!r}, '.format( val=val ),')'
+                beg,end		= 'array( {val.typecode!r}, '.format( val=val ),')'
             elif isinstance( val, bytearray ):
-                beg,end	= 'bytearray(',')'
+                beg,end		= 'bytearray(',')'
             else:
-                beg,end	= 'bytes(',')'
-            result     += "{beg}hexload('''".format( beg=beg )
-            result     += ''.join( newline + prefix + row for row in misc.hexdumper( val ))
-            result     += newline + "'''){end},".format( end=end )
+                beg,end		= 'bytes(',')'
+            result	       += "{beg}hexload('''".format( beg=beg )
+            result	       += ''.join( newline + prefix + row for row in misc.hexdumper( val ))
+            result	       += newline + "'''){end},".format( end=end )
             continue
 
         if is_listlike( val ) and len( val ) > 10:
             # Try to tabularize large lists of data
             try:
-                beg,end	= getattr( getattr( val, '__class__' ), '__name__' ) + '(',')'
+                beg,end		= getattr( getattr( val, '__class__' ), '__name__' ) + '(',')'
             except:
                 pass
             else:
-                result += beg
+                result	       += beg
                 for i,v in enumerate( val ):
                     if i%10 == 0:
                         result += newline + prefix
-                    fmt	= "{v:<8}" if isinstance( v, type_str_base ) else "{v:>8}"
-                    result += fmt.format( v=repr( v )+',' )
-                result += newline + end + ','
+                    fmt		= "{v:<8}" if isinstance( v, type_str_base ) else "{v:>8}"
+                    result     += fmt.format( v=repr( v )+',' )
+                result	       += newline + end + ','
                 continue
 
         # Other data types
-        result	       += repr( val )
-        result	       += ','
-    result	       += '\n}'
+        result		       += repr( val )
+        result		       += ','
+    result		       += '\n}'
     return result
 
 #