diff options
| author | Maciej Żenczykowski <maze@google.com> | 2024-02-21 06:25:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-21 06:25:41 +0000 |
| commit | 817dc8b7a1eb97e8dd59e1140e3a74760cc89f87 (patch) | |
| tree | e4babefd78b4603a1ee3f2a900c245756dda7372 | |
| parent | 65670f0204d3bbb5f8dae115bdb35557c2b4e9a7 (diff) | |
| parent | 554fbe59d6758b96b4f05949ba660d4e055cb324 (diff) | |
| download | tests-817dc8b7a1eb97e8dd59e1140e3a74760cc89f87.tar.gz | |
net-test: kernel_feature_test - simplify reject_skerr test am: 554fbe59d6
Original change: https://android-review.googlesource.com/c/kernel/tests/+/2970614
Change-Id: I67d189b9af63a54aa0adc22a5316f45c85738266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | net/test/kernel_feature_test.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/net/test/kernel_feature_test.py b/net/test/kernel_feature_test.py index 5fc8606..ea093ec 100755 --- a/net/test/kernel_feature_test.py +++ b/net/test/kernel_feature_test.py @@ -47,26 +47,13 @@ class RemovedFeatureTest(net_test.NetworkTest): def assertFeatureAbsent(self, featureName): return self.assertTrue(featureName not in self.KCONFIG) - def testNetfilterRejectWithSocketError(self): - """Verify that the CONFIG_IP{,6}_NF_TARGET_REJECT_SKERR option is gone. - - The commits to be reverted include: - - android-3.10: 6f489c42 - angler: 6f489c42 - bullhead: 6f489c42 - shamu: 6f489c42 - flounder: 6f489c42 - - See b/28424847 and b/28719525 for more context. - """ + def testNetfilterRejectEnabled(self): + """Verify that CONFIG_IP{,6}_NF_{FILTER,TARGET_REJECT} is enabled.""" self.assertFeatureEnabled("CONFIG_IP_NF_FILTER") self.assertFeatureEnabled("CONFIG_IP_NF_TARGET_REJECT") - self.assertFeatureAbsent("CONFIG_IP_NF_TARGET_REJECT_SKERR") self.assertFeatureEnabled("CONFIG_IP6_NF_FILTER") self.assertFeatureEnabled("CONFIG_IP6_NF_TARGET_REJECT") - self.assertFeatureAbsent("CONFIG_IP6_NF_TARGET_REJECT_SKERR") def testRemovedAndroidParanoidNetwork(self): """Verify that ANDROID_PARANOID_NETWORK is gone. |