swupd: Remove totalSteps from JSON

Remove totalSteps from swupd JSON message to align with swupd's removal of this entry. Signed-off-by: John Akre <[email protected]>
clearlinux · Oct 16, 2019 · 0f9f5b5 · 0f9f5b5
1 parent 1dd110d
commit 0f9f5b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/swupd/swupd.go b/swupd/swupd.go
@@ -122,7 +122,6 @@ type Message struct {
 	Section         string `json:"section"`
 	Status          int    `json:"status"`
 	CurrentStep     int    `json:"currentStep"`
-	TotalSteps      int    `json:"totalSteps"`
 	StepCompletion  int    `json:"stepCompletion"`
 	StepDescription string `json:"stepDescription"`
 }

diff --git a/swupd/swupd_test.go b/swupd/swupd_test.go
@@ -169,7 +169,7 @@ func TestProcess(t *testing.T) {
 	}
 
 	// "progress" messages should be processed correctly
-	jsonMsg = "{ \"type\" : \"progress\", \"currentStep\" : 5, \"totalSteps\" : 8, \"stepCompletion\" : 80, \"stepDescription\" : \"download_packs\" },"
+	jsonMsg = "{ \"type\" : \"progress\", \"currentStep\" : 5, \"stepCompletion\" : 80, \"stepDescription\" : \"download_packs\" },"
 	msg.Process("", jsonMsg)
 	if mp.description != "Downloading required packs" {
 		t.Fatal("Message processed incorrectly. Expected: 'Downloading required packs', Actual:", mp.description)
@@ -180,7 +180,7 @@ func TestProcess(t *testing.T) {
 	if mp.output != "" {
 		t.Fatal("Message processed incorrectly. Expected: '', Actual:", mp.output)
 	}
-	jsonMsg = "{ \"type\" : \"progress\", \"currentStep\" : 8, \"totalSteps\" : 8, \"stepCompletion\" : 100, \"stepDescription\" : \"add_missing_files\" },"
+	jsonMsg = "{ \"type\" : \"progress\", \"currentStep\" : 8, \"stepCompletion\" : 100, \"stepDescription\" : \"add_missing_files\" },"
 	msg.Process("", jsonMsg)
 	if mp.description != "Installing base OS and configured bundles" {
 		t.Fatal("Message processed incorrectly. Expected: 'Installing base OS and configured bundles', Actual:", mp.description)