diff options
| author | Maciej Żenczykowski <maze@google.com> | 2022-01-07 18:41:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-07 18:41:40 +0000 |
| commit | 6c29b003944ac1259faa3fa1062513ef0be05734 (patch) | |
| tree | 75948bb70e6ac8e85b32b3665be67519774a061c | |
| parent | ac92115f42b6cc5d924af364e87dfa9c7c3a66ea (diff) | |
| parent | b66bfc2de89054b571fa8eb54dc75904807e73df (diff) | |
| download | tests-6c29b003944ac1259faa3fa1062513ef0be05734.tar.gz | |
net-test: when running under Android run inside netns if possible am: d3c14e9e92 am: b66bfc2de8
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1938819
Change-Id: I2b38b03dc688bbc2286f52a5477eae5853d7c67e
| -rwxr-xr-x | net/test/all_tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/test/all_tests.py b/net/test/all_tests.py index 17d9701..2305354 100755 --- a/net/test/all_tests.py +++ b/net/test/all_tests.py @@ -15,6 +15,7 @@ # limitations under the License. import importlib +import os import sys import unittest @@ -48,8 +49,9 @@ test_modules = [ ] if __name__ == '__main__': - # Check whether ADB over TCP is occupying TCP port 5555. - if namespace.HasEstablishedTcpSessionOnPort(5555): + # Check whether ADB over TCP is occupying TCP port 5555, + # or if we're on a real Android device + if os.path.isdir('/system') or namespace.HasEstablishedTcpSessionOnPort(5555): namespace.IfPossibleEnterNewNetworkNamespace() # First, run InjectTests on all modules, to ensure that any parameterized # tests in those modules are injected. |