summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-05-27 09:23:51 +0000
committerMaciej Zenczykowski <maze@google.com>2020-05-27 09:40:04 +0000
commit4ce0aed14cec158294e022111bde85940bd46012 (patch)
treebc54317166ea5396d55cb4281396cfd5ab4fac52
parent8729a90040f2aeaab4fc9423cd2667a4efb64d4d (diff)
downloadtests-4ce0aed14cec158294e022111bde85940bd46012.tar.gz
net-test: prefix %x with 0x
Fix for: Creating clean namespace... failed: [Errno 22] Invalid argument while unshare(44020000) (likely: no privs or lack of kernel support). Bug: 149894399 Test: ran 'atest vts_kernel_net_tests' Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I6364cbba4d210423749107b5a2edff1de43caf15 Merged-In: I6364cbba4d210423749107b5a2edff1de43caf15
-rw-r--r--net/test/namespace.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/test/namespace.py b/net/test/namespace.py
index 986fb59..f7fbaf4 100644
--- a/net/test/namespace.py
+++ b/net/test/namespace.py
@@ -76,7 +76,7 @@ def Mount(src, tgt, fs, flags=MS_NODEV|MS_NOEXEC|MS_NOSUID|MS_RELATIME):
ret = libc.mount(src, tgt, fs, flags, None)
if ret < 0:
errno = ctypes.get_errno()
- raise OSError(errno, '%s mounting %s on %s (fs=%s flags=%x)'
+ raise OSError(errno, '%s mounting %s on %s (fs=%s flags=0x%x)'
% (os.strerror(errno), src, tgt, fs, flags))
@@ -105,7 +105,7 @@ def UnShare(flags):
ret = libc.unshare(flags)
if ret < 0:
errno = ctypes.get_errno()
- raise OSError(errno, '%s while unshare(%x)' % (os.strerror(errno), flags))
+ raise OSError(errno, '%s while unshare(0x%x)' % (os.strerror(errno), flags))
def DumpMounts(hdr):