Remove duplication in log file names

Author: jpm-canonical

tests/thread_tests/thread_test.go

@@ -18,14 +18,14 @@ func TestAllClustersAppThread(t *testing.T) {
 	t.Run("Commission", func(t *testing.T) {
 		stdout, _, _ := utils.Exec(t, "chip-tool pairing code-thread 110 hex:"+trimmedActiveDataset+" 34970112332 2>&1")
 
-		assert.NoError(t, utils.WriteLogFile(t, "chip-tool-thread-pairing", stdout))
+		assert.NoError(t, utils.WriteLogFile(t, "chip-tool", stdout))
 	})
 
 	t.Run("Control", func(t *testing.T) {
 		start := time.Now()
 		stdout, _, _ := utils.Exec(t, "chip-tool onoff toggle 110 1 2>&1")
 
-		assert.NoError(t, utils.WriteLogFile(t, "chip-tool-thread-onoff", stdout))
+		assert.NoError(t, utils.WriteLogFile(t, "chip-tool", stdout))
 
 		// 0x6 is the Matter Cluster ID for on-off
 		// Using cluster ID here because of a buffering issue in the log stream:

tests/upgrade_test.go

@@ -48,7 +48,7 @@ func TestUpgrade(t *testing.T) {
 
 	t.Run("Commission", func(t *testing.T) {
 		stdout, _, _ := utils.Exec(t, "chip-tool pairing onnetwork 110 20202021 2>&1")
-		assert.NoError(t, utils.WriteLogFile(t, "chip-tool-pairing", stdout))
+		assert.NoError(t, utils.WriteLogFile(t, chipToolSnap, stdout))
 	})
 
 	t.Run("Control before upgrade", func(t *testing.T) {
@@ -58,7 +58,7 @@ func TestUpgrade(t *testing.T) {
 
 		start := time.Now()
 		stdout, _, _ := utils.Exec(t, "chip-tool onoff on 110 1 2>&1")
-		assert.NoError(t, utils.WriteLogFile(t, "chip-tool-onoff", stdout))
+		assert.NoError(t, utils.WriteLogFile(t, chipToolSnap, stdout))
 
 		waitForOnOffHandlingByAllClustersApp(t, start)
 	})
@@ -71,14 +71,14 @@ func TestUpgrade(t *testing.T) {
 		}
 	})
 
-	t.Run("Control upgraded snap", func(t *testing.T) {
+	t.Run("Control after upgrade", func(t *testing.T) {
 		snapVersion := utils.SnapVersion(t, chipToolSnap)
 		snapRevision := utils.SnapRevision(t, chipToolSnap)
 		log.Printf("%s installed version %s build %s\n", chipToolSnap, snapVersion, snapRevision)
 
 		start := time.Now()
 		stdout, _, _ := utils.Exec(t, "chip-tool onoff off 110 1 2>&1")
-		assert.NoError(t, utils.WriteLogFile(t, "chip-tool-onoff", stdout))
+		assert.NoError(t, utils.WriteLogFile(t, chipToolSnap, stdout))
 
 		waitForOnOffHandlingByAllClustersApp(t, start)
 	})

tests/wifi_test.go

@@ -36,12 +36,12 @@ func TestAllClustersAppWiFi(t *testing.T) {
 
 	t.Run("Commission", func(t *testing.T) {
 		stdout, _, _ := utils.Exec(t, "chip-tool pairing onnetwork 110 20202021 2>&1")
-		assert.NoError(t, utils.WriteLogFile(t, "chip-tool-pairing", stdout))
+		assert.NoError(t, utils.WriteLogFile(t, chipToolSnap, stdout))
 	})
 
 	t.Run("Control", func(t *testing.T) {
 		stdout, _, _ := utils.Exec(t, "chip-tool onoff toggle 110 1 2>&1")
-		assert.NoError(t, utils.WriteLogFile(t, "chip-tool-toggle", stdout))
+		assert.NoError(t, utils.WriteLogFile(t, chipToolSnap, stdout))
 
 		waitForOnOffHandlingByAllClustersApp(t, start)
 	})