tests: minor fixes for event-timers code

Avoid a couple of magic numbers, and wrap the .py at 80.

Signed-off-by: Jeremy Kerr <[email protected]>

Author: jk-ozlabs

tests/mctp-ops-test.c

@@ -241,7 +241,7 @@ int wrapped_time_callback(sd_event_source *source, int fd, uint revents,
 	ssize_t rc;
 
 	rc = read(fd, &usec, sizeof(usec));
-	if (rc != 8)
+	if (rc != sizeof(usec))
 		errx(EXIT_FAILURE, "ops protocol error");
 
 	rc = wrapud->callback(source, usec, wrapud->userdata);
@@ -269,7 +269,7 @@ static int mctp_op_sd_event_add_time_relative(
 		return -errno;
 
 	rc = write(sd, &usec, sizeof(usec));
-	if (rc != 8)
+	if (rc != sizeof(usec))
 		errx(EXIT_FAILURE, "ops protocol error");
 
 	wrapud = malloc(sizeof(*wrapud));

tests/mctpenv/__init__.py

@@ -1133,7 +1133,9 @@ async def run(self):
 
                 # timed out
                 if scope.cancelled_caught:
-                    await self.sock.send(struct.pack('@Q', math.floor(trio.current_time() * 1000000)))
+                    data = struct.pack('@Q',
+                            math.floor(trio.current_time() * 1000000))
+                    await self.sock.send(data)
                     self.delay = sys.maxsize
             except (ConnectionResetError, BrokenPipeError) as ex:
                 break