diff options
author | Jonathan Basseri <misterikkit@google.com> | 2017-06-01 22:26:30 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-01 22:26:30 +0000 |
commit | 47c13280e086812e9bcb9f0cff31d7a2c6378ef1 (patch) | |
tree | 2383579a3e1f5c1d87a211c5ed12f2faba0f5c03 | |
parent | cf8614ba03fa3b5f71da6019d095c68881896039 (diff) | |
parent | 3fa70dadad1981a5adb66d67632def9da21c6154 (diff) | |
download | kernel_tests-oreo-dr1-dev.tar.gz kernel_tests-oreo-dr1-dev.tar.bz2 kernel_tests-oreo-dr1-dev.zip |
Support "with"-style errno assertions. am: 2f4685bfae am: 8159f234a1 am: b3a5dd6764oreo-dr1-dev
am: 3fa70dadad
Change-Id: I1f1c6388109b6ab69c29a663b134e43e3e1a5626
-rwxr-xr-x | net/test/net_test.py | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/net/test/net_test.py b/net/test/net_test.py index 9a5c635e..423228be 100755 --- a/net/test/net_test.py +++ b/net/test/net_test.py @@ -375,9 +375,27 @@ class RunAsUid(RunAsUidGid): class NetworkTest(unittest.TestCase): - def assertRaisesErrno(self, err_num, f, *args): + def assertRaisesErrno(self, err_num, f=None, *args): + """Test that the system returns an errno error. + + This works similarly to unittest.TestCase.assertRaises. You can call it as + an assertion, or use it as a context manager. + e.g. + self.assertRaisesErrno(errno.ENOENT, do_things, arg1, arg2) + or + with self.assertRaisesErrno(errno.ENOENT): + do_things(arg1, arg2) + + Args: + err_num: an errno constant + f: (optional) A callable that should result in error + *args: arguments passed to f + """ msg = os.strerror(err_num) - self.assertRaisesRegexp(EnvironmentError, msg, f, *args) + if f is None: + return self.assertRaisesRegexp(EnvironmentError, msg) + else: + self.assertRaisesRegexp(EnvironmentError, msg, f, *args) def ReadProcNetSocket(self, protocol): # Read file. |