X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync_sync_test.go;h=f0e7524e8186a6d803c6d8e5ac326e95f722a93e;hb=a583eff808817656f8ddb81ddfca3c1fd1f6c85f;hp=a5f65811e0d82297f642f01dcf027dd175ff9da3;hpb=20686d0d25d7d22f577fc80df31c192b6a88d318;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync_sync_test.go b/cmd/safcm/sync_sync_test.go
index a5f6581..f0e7524 100644
--- a/cmd/safcm/sync_sync_test.go
+++ b/cmd/safcm/sync_sync_test.go
@@ -149,7 +149,7 @@ func TestHostSyncReq(t *testing.T) {
 			},
 			[]string{
 				"host1.example.org: <nil> 3 host groups: all group group3 host1.example.org remove",
-				"host1.example.org: <nil> 3 host group priorities (desc. order): host1.example.org",
+				"host1.example.org: <nil> 3 host group priorities (descending): host1.example.org",
 			},
 			nil,
 		},
@@ -265,9 +265,9 @@ func TestHostSyncReq(t *testing.T) {
 			safcm.MsgSyncReq{},
 			[]string{
 				"host1.example.org: <nil> 3 host groups: all dns host1.example.org",
-				"host1.example.org: <nil> 3 host group priorities (desc. order): host1.example.org",
+				"host1.example.org: <nil> 3 host group priorities (descending): host1.example.org",
 			},
-			fmt.Errorf("groups dns and all both provide file \"/etc/resolv.conf\"\nUse 'group_order' in config.yaml to declare preference"),
+			fmt.Errorf("groups dns and all both provide file \"/etc/resolv.conf\"\nUse 'group_priority' in config.yaml to declare preference"),
 		},
 		{
 			"conflict: file from detected group",
@@ -280,9 +280,9 @@ func TestHostSyncReq(t *testing.T) {
 			safcm.MsgSyncReq{},
 			[]string{
 				"host2.example.org: <nil> 3 host groups: all detected_other host2.example.org other",
-				"host2.example.org: <nil> 3 host group priorities (desc. order): host2.example.org",
+				"host2.example.org: <nil> 3 host group priorities (descending): host2.example.org",
 			},
-			fmt.Errorf("groups other and all both provide file \"/etc/resolv.conf\"\nUse 'group_order' in config.yaml to declare preference"),
+			fmt.Errorf("groups other and all both provide file \"/etc/resolv.conf\"\nUse 'group_priority' in config.yaml to declare preference"),
 		},
 
 		{
@@ -294,9 +294,9 @@ func TestHostSyncReq(t *testing.T) {
 			safcm.MsgSyncReq{},
 			[]string{
 				"host1.example.org: <nil> 3 host groups: all dns host1.example.org",
-				"host1.example.org: <nil> 3 host group priorities (desc. order): host1.example.org",
+				"host1.example.org: <nil> 3 host group priorities (descending): host1.example.org",
 			},
-			fmt.Errorf("groups dns and all both provide file \"/etc\"\nUse 'group_order' in config.yaml to declare preference"),
+			fmt.Errorf("groups dns and all both provide file \"/etc\"\nUse 'group_priority' in config.yaml to declare preference"),
 		},
 		{
 			"conflict: dir from detected group",
@@ -309,9 +309,9 @@ func TestHostSyncReq(t *testing.T) {
 			safcm.MsgSyncReq{},
 			[]string{
 				"host2.example.org: <nil> 3 host groups: all detected_other host2.example.org other",
-				"host2.example.org: <nil> 3 host group priorities (desc. order): host2.example.org",
+				"host2.example.org: <nil> 3 host group priorities (descending): host2.example.org",
 			},
-			fmt.Errorf("groups other and all both provide file \"/etc\"\nUse 'group_order' in config.yaml to declare preference"),
+			fmt.Errorf("groups other and all both provide file \"/etc\"\nUse 'group_priority' in config.yaml to declare preference"),
 		},
 
 		{
@@ -326,8 +326,8 @@ func TestHostSyncReq(t *testing.T) {
 		},
 
 		{
-			"group_order",
-			"project-group_order",
+			"group_priority",
+			"project-group_priority",
 			"host1.example.org",
 			nil,
 			safcm.LogDebug3,
@@ -422,7 +422,7 @@ func TestHostSyncReq(t *testing.T) {
 			},
 			[]string{
 				"host1.example.org: <nil> 3 host groups: all group-a group-b host1.example.org",
-				"host1.example.org: <nil> 3 host group priorities (desc. order): host1.example.org group-a group-b all",
+				"host1.example.org: <nil> 3 host group priorities (descending): host1.example.org group-a group-b all",
 				`host1.example.org: <nil> 4 files: "/etc": group group-a overwrites triggers from group group-b`,
 				`host1.example.org: <nil> 4 files: "/etc": group host1.example.org overwrites triggers from group group-a`,
 			},
@@ -430,8 +430,8 @@ func TestHostSyncReq(t *testing.T) {
 		},
 
 		{
-			"group_order (single group)",
-			"project-group_order-single",
+			"group_priority (single group)",
+			"project-group_priority-single",
 			"host1.example.org",
 			nil,
 			safcm.LogDebug3,
@@ -457,7 +457,7 @@ func TestHostSyncReq(t *testing.T) {
 			},
 			[]string{
 				"host1.example.org: <nil> 3 host groups: all group-a group-b host1.example.org",
-				"host1.example.org: <nil> 3 host group priorities (desc. order): host1.example.org group-a",
+				"host1.example.org: <nil> 3 host group priorities (descending): host1.example.org group-a",
 			},
 			nil,
 		},