commit 96ee6f6aa4c99e0c8a4748ddb95bcf5c5dad4064
author Hugo Benichi <hugobenichi@google.com> Mon Jun 28 14:07:20 2021 +0900
committer Commit Bot <commit-bot@chromium.org> Sat Jul 10 00:38:17 2021 +0000
tree 195c2c1be1b76bec6aa3193b83d530743c0db4bb
parent 153c711e3cc1436980efa481ba9c1b7c1812ac68

patchpanel: use System in MinijailedProcessRunner

Also makes unit tests of MinijailedProcessRunner more strictly asserts
arguments and expected calls.

BUG=b:178980566
TEST=Unit tests. Compiled, flashed trogdor, booted, started user
session, checked iptables setup and ARC setup.

Change-Id: I28e365f23cb45f9a2285c77c3d7e7feecdba5f63
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2991802
Tested-by: Hugo Benichi <hugobenichi@google.com>
Commit-Queue: Hugo Benichi <hugobenichi@google.com>
Reviewed-by: Garrick Evans <garrick@chromium.org>

patchpanel/system.h

diff --git a/patchpanel/system.h b/patchpanel/system.h
index 011aedb..98cb089 100644
--- a/patchpanel/system.h
+++ b/patchpanel/system.h
@@ -5,11 +5,12 @@
 #ifndef PATCHPANEL_SYSTEM_H_
 #define PATCHPANEL_SYSTEM_H_
 
-#include <string>
-
 #include <net/if.h>
 #include <net/route.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+
+#include <string>
 
 namespace patchpanel {
 
@@ -57,6 +58,8 @@
   int Ioctl(int fd, ioctl_req_t request, struct ifreq* ifr);
   int Ioctl(int fd, ioctl_req_t request, struct rtentry* route);
 
+  virtual pid_t WaitPid(pid_t pid, int* wstatus, int options = 0);
+
   static bool Write(const std::string& path, const std::string& content);
 
  private: