updated sys-fw tests

daemon/firewall/config/config_test.go

@@ -0,0 +1,26 @@
+package config
+
+import (
+	"testing"
+)
+
+func preloadConfCallback() {
+}
+
+func reloadConfCallback() {
+}
+
+func TestNftLoadFromDisk(t *testing.T) {
+	/*skipIfNotPrivileged(t)
+
+	conn, newNS = OpenSystemConn(t)
+	defer CleanupSystemConn(t, newNS)
+	nft.conn = conn
+	*/
+	cfg := &Config{}
+	cfg.NewSystemFwConfig("", preloadConfCallback, reloadConfCallback)
+	cfg.SetConfigFile("../nftables/testdata/test-sysfw-conf.json")
+	if err := cfg.LoadDiskConfiguration(false); err != nil {
+		t.Errorf("Error loading config from disk: %s", err)
+	}
+}

daemon/firewall/nftables/monitor_test.go

@@ -85,6 +85,7 @@ func TestMonitorReload(t *testing.T) {
 	defer nftest.CleanupSystemConn(t, newNS)
 	nftest.Fw.Conn = conn
 
+	nftest.Fw.SetRulesCheckerInterval("10s")
 	nftest.Fw.EnableInterception()
 
 	// test that rules are reloaded after being deleted, but also