Merge remote-tracking branch 'github/merge-tests' into merge-tests

Araneidae · Araneidae · commit 3cdbfdd37a9c · 2022-01-12T09:43:28.000Z
diff --git a/tests/expected_records.db b/tests/expected_records.db
@@ -57,6 +57,7 @@ record(waveform, "TS-DI-TEST-01:LONGSTRING")
     field(FTVL, "UCHAR")
     field(INP,  "@TS-DI-TEST-01:LONGSTRING")
     field(NELM, "256")
+    field(PINI, "YES")
     field(SCAN, "I/O Intr")
 }
 
@@ -97,6 +98,7 @@ record(waveform, "TS-DI-TEST-01:SIN")
     field(FTVL, "DOUBLE")
     field(INP,  "@TS-DI-TEST-01:SIN")
     field(NELM, "1024")
+    field(PINI, "YES")
     field(SCAN, "I/O Intr")
 }
 
@@ -145,9 +147,10 @@ record(waveform, "TS-DI-TEST-01:WAVEFORM2")
 {
     field(DISP, "1")
     field(DTYP, "Python")
-    field(FTVL, "FLOAT")
+    field(FTVL, "DOUBLE")
     field(INP,  "@TS-DI-TEST-01:WAVEFORM2")
     field(NELM, "10")
+    field(PINI, "YES")
     field(SCAN, "I/O Intr")
 }
 
diff --git a/tests/test_records.py b/tests/test_records.py
@@ -166,7 +166,7 @@ def record_values_names(fixture_value):
         builder.WaveformIn,
         b"HELLO\0WORLD",
         numpy.array(
-            [72, 69, 76, 76, 79, 0, 87, 79, 82, 76, 68, 0], dtype=numpy.uint8
+            [72, 69, 76, 76, 79, 0, 87, 79, 82, 76, 68], dtype=numpy.uint8
         ),
         numpy.ndarray,
     ),
@@ -175,7 +175,7 @@ def record_values_names(fixture_value):
         builder.WaveformOut,
         b"HELLO\0WORLD",
         numpy.array(
-            [72, 69, 76, 76, 79, 0, 87, 79, 82, 76, 68, 0], dtype=numpy.uint8
+            [72, 69, 76, 76, 79, 0, 87, 79, 82, 76, 68], dtype=numpy.uint8
         ),
         numpy.ndarray,
     ),

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ record(waveform, "TS-DI-TEST-01:LONGSTRING")`
`57`	`57`	`field(FTVL, "UCHAR")`
`58`	`58`	`field(INP, "@TS-DI-TEST-01:LONGSTRING")`
`59`	`59`	`field(NELM, "256")`
	`60`	`+ field(PINI, "YES")`
`60`	`61`	`field(SCAN, "I/O Intr")`
`61`	`62`	`}`
`62`	`63`
`@@ -97,6 +98,7 @@ record(waveform, "TS-DI-TEST-01:SIN")`
`97`	`98`	`field(FTVL, "DOUBLE")`
`98`	`99`	`field(INP, "@TS-DI-TEST-01:SIN")`
`99`	`100`	`field(NELM, "1024")`
	`101`	`+ field(PINI, "YES")`
`100`	`102`	`field(SCAN, "I/O Intr")`
`101`	`103`	`}`
`102`	`104`
`@@ -145,9 +147,10 @@ record(waveform, "TS-DI-TEST-01:WAVEFORM2")`
`145`	`147`	`{`
`146`	`148`	`field(DISP, "1")`
`147`	`149`	`field(DTYP, "Python")`
`148`		`- field(FTVL, "FLOAT")`
	`150`	`+ field(FTVL, "DOUBLE")`
`149`	`151`	`field(INP, "@TS-DI-TEST-01:WAVEFORM2")`
`150`	`152`	`field(NELM, "10")`
	`153`	`+ field(PINI, "YES")`
`151`	`154`	`field(SCAN, "I/O Intr")`
`152`	`155`	`}`
`153`	`156`