diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-07-01 11:51:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-01 11:51:52 +0000 |
| commit | 9c74b002298fb655978196a183daafe471863716 (patch) | |
| tree | ec36741078d8f126a549803ffa7a4a85e17f30e5 | |
| parent | cbda46e54e1f5bab41fd919d974013d855a3a004 (diff) | |
| parent | aee2cbe30f5097ec85daa2cfabfe7377dfd5e542 (diff) | |
| download | netd-9c74b002298fb655978196a183daafe471863716.tar.gz | |
Revert "Disable IdletimerAddRemoveInterface test on >=5.10" am: aee2cbe30f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/15166708
Change-Id: I31f88ef96bbb5a5dea41745febb23a216a43bd33
| -rw-r--r-- | tests/binder_test.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp index 69d1f9b5..1658abcb 100644 --- a/tests/binder_test.cpp +++ b/tests/binder_test.cpp @@ -43,7 +43,6 @@ #include <openssl/base64.h> #include <sys/socket.h> #include <sys/types.h> -#include <sys/utsname.h> #include <android-base/file.h> #include <android-base/format.h> @@ -1229,16 +1228,6 @@ void expectIdletimerInterfaceRuleNotExists(const std::string& ifname, int timeou } // namespace TEST_F(NetdBinderTest, IdletimerAddRemoveInterface) { - // TODO(b/175745224): Temporarily disable idletimer test on >5.10 kernels - utsname u; - if (!uname(&u)) { - unsigned long major, minor; - char *p; - major = strtoul(u.release, &p, 10); - minor = strtoul(++p, NULL, 10); - if (major > 5 || (major == 5 && minor >= 10)) return; - } - // TODO: We will get error in if expectIdletimerInterfaceRuleNotExists if there are the same // rule in the table. Because we only check the result after calling remove function. We might // check the actual rule which is removed by our function (maybe compare the results between |