From 868323f6990f7c1394b0e8779bcdeb5b97edef1b Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Fri, 21 Mar 2025 18:15:01 +0100 Subject: [PATCH] remove test rewrite hack Signed-off-by: Kristoffer Dalby --- hscontrol/db/node_test.go | 11 +++-------- hscontrol/policy/policy_test.go | 19 +------------------ 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/hscontrol/db/node_test.go b/hscontrol/db/node_test.go index c92a4497..6321747e 100644 --- a/hscontrol/db/node_test.go +++ b/hscontrol/db/node_test.go @@ -440,16 +440,11 @@ func TestAutoApproveRoutes(t *testing.T) { adb, err := newSQLiteTestDB() require.NoError(t, err) - suffix := "" - if version == 1 { - suffix = "@" - } - - user, err := adb.CreateUser(types.User{Name: "test" + suffix}) + user, err := adb.CreateUser(types.User{Name: "test"}) require.NoError(t, err) - _, err = adb.CreateUser(types.User{Name: "test2" + suffix}) + _, err = adb.CreateUser(types.User{Name: "test2"}) require.NoError(t, err) - taggedUser, err := adb.CreateUser(types.User{Name: "tagged" + suffix}) + taggedUser, err := adb.CreateUser(types.User{Name: "tagged"}) require.NoError(t, err) node := types.Node{ diff --git a/hscontrol/policy/policy_test.go b/hscontrol/policy/policy_test.go index e67af16f..cfd38765 100644 --- a/hscontrol/policy/policy_test.go +++ b/hscontrol/policy/policy_test.go @@ -97,19 +97,6 @@ func TestTheInternet(t *testing.T) { } } -// addAtForFilterV1 returns a copy of the given userslice -// and adds "@" character to the Name field. -// This is a "compatibility" move to allow the old tests -// to run against the "new" format which requires "@". -func addAtForFilterV1(users types.Users) types.Users { - ret := make(types.Users, len(users)) - for idx := range users { - ret[idx] = users[idx] - ret[idx].Name = ret[idx].Name + "@" - } - return ret -} - func TestReduceFilterRules(t *testing.T) { users := types.Users{ types.User{Model: gorm.Model{ID: 1}, Name: "mickael"}, @@ -780,11 +767,7 @@ func TestReduceFilterRules(t *testing.T) { t.Run(fmt.Sprintf("%s-v%d", tt.name, version), func(t *testing.T) { var pm PolicyManager var err error - if version == 1 { - pm, err = pmf(addAtForFilterV1(users), append(tt.peers, tt.node)) - } else { - pm, err = pmf(users, append(tt.peers, tt.node)) - } + pm, err = pmf(users, append(tt.peers, tt.node)) require.NoError(t, err) got := pm.Filter() got = ReduceFilterRules(tt.node, got)