diff options
| author | Maciej Żenczykowski <maze@google.com> | 2024-02-20 14:47:37 -0800 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2024-02-20 14:55:19 -0800 |
| commit | 554fbe59d6758b96b4f05949ba660d4e055cb324 (patch) | |
| tree | e4babefd78b4603a1ee3f2a900c245756dda7372 | |
| parent | 1e76fc2ae08fbb15f8bfcf329b4eec63c0eca28a (diff) | |
| download | tests-554fbe59d6758b96b4f05949ba660d4e055cb324.tar.gz | |
net-test: kernel_feature_test - simplify reject_skerr test
3.10 is absolutely ancient, so this test is no longer needed,
keep just the portion which requires netfilter/reject,
even though that too is probably not needed.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1a33c052a64d362728100ef86f0c4cf28ea335f0
| -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. |