From ad5f415f6aa86c35384177b71b0a7f7ea8615bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 5 Mar 2024 19:55:51 -0800 Subject: net-test: minor refactor of kernel_feature_test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to better support difference of built-in vs modular Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: Ieae2f64d1ce43c529c754bd7d8cef0fa2806634e --- net/test/kernel_feature_test.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/net/test/kernel_feature_test.py b/net/test/kernel_feature_test.py index 2e1f140..cde19aa 100755 --- a/net/test/kernel_feature_test.py +++ b/net/test/kernel_feature_test.py @@ -51,19 +51,25 @@ class KernelFeatureTest(net_test.NetworkTest): super(net_test.NetworkTest, cls).setUpClass() cls.loadKernelConfig() - def assertFeatureEnabled(self, feature_name): - return self.assertEqual("y", self.KCONFIG[feature_name]) - def assertFeatureAbsent(self, feature_name): return self.assertNotIn(feature_name, self.KCONFIG) + def assertFeatureBuiltIn(self, feature_name): + return self.assertEqual("y", self.KCONFIG[feature_name]) + + def assertFeatureModular(self, feature_name): + return self.assertEqual("m", self.KCONFIG[feature_name]) + + def assertFeatureEnabled(self, feature_name): + return self.assertIn(self.KCONFIG[feature_name], ["m", "y"]) + 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.assertFeatureBuiltIn("CONFIG_IP_NF_FILTER") + self.assertFeatureBuiltIn("CONFIG_IP_NF_TARGET_REJECT") - self.assertFeatureEnabled("CONFIG_IP6_NF_FILTER") - self.assertFeatureEnabled("CONFIG_IP6_NF_TARGET_REJECT") + self.assertFeatureBuiltIn("CONFIG_IP6_NF_FILTER") + self.assertFeatureBuiltIn("CONFIG_IP6_NF_TARGET_REJECT") def testRemovedAndroidParanoidNetwork(self): """Verify that ANDROID_PARANOID_NETWORK is gone. -- cgit v1.2.3