test rebase

Author: giulio93

.github/workflows/test-update.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - test_package_update
+      - test_package_update_rebase
   workflow_dispatch:
 
 permissions:

internal/testtools/test_deb_update/deb_test.go

@@ -19,61 +19,59 @@ func TestStableToUnstable(t *testing.T) {
 	FetchDebPackage(t, "build/stable", "arduino-router", "latest", *arch)
 	majorTag := majorTag(t, tagAppCli)
 	_ = minorTag(t, tagAppCli)
+
 	fmt.Printf("Updating from stable version %s to unstable version %s \n", tagAppCli, majorTag)
 	fmt.Printf("Building local deb version %s \n", majorTag)
 	buildDebVersion(t, "build", majorTag, *arch)
-	fmt.Printf("Check folder structure and deb downloaded\n")
-	ls(t)
-	fmt.Println("**** BUILD docker image *****")
-	buildDockerImage(t, "test.Dockerfile", "apt-test-update-image", *arch)
-	fmt.Println("**** RUN docker image *****")
-	runDockerContainer(t, "apt-test-update", "apt-test-update-image")
-	preUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
-	runDockerSystemUpdate(t, "apt-test-update")
-	postUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
-	runDockerCleanUp(t, "apt-test-update")
-	require.Equal(t, preUpdateVersion, "Arduino App CLI "+tagAppCli+"\n")
-	require.Equal(t, postUpdateVersion, "Arduino App CLI "+majorTag+"\n")
-}
 
-func TestClientUpdateStU(t *testing.T) {
+	t.Run("CLI Update Testing", func(t *testing.T) {
 
-	fmt.Printf("***** ARCH %s ***** \n", *arch)
-	tagAppCli := FetchDebPackage(t, "build/stable", "arduino-app-cli", "latest", *arch)
-	FetchDebPackage(t, "build/stable", "arduino-router", "latest", *arch)
-	majorTag := majorTag(t, tagAppCli)
+		fmt.Printf("Check folder structure and deb downloaded\n")
+		ls(t)
+		fmt.Println("**** BUILD docker image *****")
+		buildDockerImage(t, "test.Dockerfile", "apt-test-update-image", *arch)
+		fmt.Println("**** RUN docker image *****")
+		runDockerContainer(t, "apt-test-update", "apt-test-update-image")
+		preUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
+		runDockerSystemUpdate(t, "apt-test-update")
+		postUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
+		runDockerCleanUp(t, "apt-test-update")
+		require.Equal(t, preUpdateVersion, "Arduino App CLI "+tagAppCli+"\n")
+		require.Equal(t, postUpdateVersion, "Arduino App CLI "+majorTag+"\n")
+	})
 
-	fmt.Println("**** RUN docker image *****")
-	runDockerContainer(t, "apt-test-update", "apt-test-update-image")
-	preUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
+	t.Run("Client Daemon Request Testing", func(t *testing.T) {
+		runDockerContainer(t, "apt-test-update", "apt-test-update-image")
+		preUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
 
-	status := runDockerDaemon(t, "apt-test-update")
-	WaitForPort(t, "127.0.0.1", "8800", 5*time.Second)
+		status := runDockerDaemon(t, "apt-test-update")
+		WaitForPort(t, "127.0.0.1", "8800", 5*time.Second)
 
-	status = putUpdateRequest(t, "http://127.0.0.1:8800/v1/system/update/apply")
-	if status != "202 Accepted" {
-		log.Fatalf("Error putting update request: %s", status)
-	}
+		status = putUpdateRequest(t, "http://127.0.0.1:8800/v1/system/update/apply")
+		if status != "202 Accepted" {
+			log.Fatalf("Error putting update request: %s", status)
+		}
 
-	itr := NewSSEClient(context.Background(), "GET", "http://localhost:8800/v1/system/update/events")
+		itr := NewSSEClient(context.Background(), "GET", "http://localhost:8800/v1/system/update/events")
 
-	for event, err := range itr {
-		if err != nil {
-			log.Printf("Error receiving SSE event: %v", err)
-		}
-		fmt.Printf("Received event: ID=%s, Event=%s, Data=%s\n", event.ID, event.Event, string(event.Data))
-		if string(event.Data) == "Download complete" {
-			fmt.Println("✅ Download complete — exiting successfully.")
-			break
+		for event, err := range itr {
+			if err != nil {
+				log.Printf("Error receiving SSE event: %v", err)
+			}
+			fmt.Printf("Received event: ID=%s, Event=%s, Data=%s\n", event.ID, event.Event, string(event.Data))
+			if string(event.Data) == "Download complete" {
+				fmt.Println("✅ Download complete — exiting successfully.")
+				break
+			}
 		}
-	}
-
-	postUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
 
-	require.Equal(t, preUpdateVersion, "Arduino App CLI "+tagAppCli+"\n")
-	require.Equal(t, postUpdateVersion, "Arduino App CLI "+majorTag+"\n")
-	runDockerCleanUp(t, "apt-test-update")
+		postUpdateVersion := runDockerSystemVersion(t, "apt-test-update")
 
+		require.Equal(t, preUpdateVersion, "Arduino App CLI "+tagAppCli+"\n")
+		require.Equal(t, postUpdateVersion, "Arduino App CLI "+majorTag+"\n")
+		runDockerCleanUp(t, "apt-test-update")
+	})
+	rmrf(t, "build")
 }
 
 func TestUnstableToStable(t *testing.T) {

internal/testtools/test_deb_update/helpers.go

@@ -308,6 +308,30 @@ func putUpdateRequest(t *testing.T, url string) string {
 
 	return resp.Status
 }
+
+func rmrf(t *testing.T, pathFile string) {
+	t.Helper()
+	// Check if the folder exists
+	if _, err := os.Stat(pathFile); os.IsNotExist(err) {
+		fmt.Println("No build directory found.")
+		return
+	}
+
+	// Run the Linux command to remove it
+	cmd := exec.Command("rm", "-rf", pathFile)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	fmt.Println("Removing build directory...")
+
+	if err := cmd.Run(); err != nil {
+		fmt.Fprintf(os.Stderr, "Error removing build folder: %v\n", err)
+		os.Exit(1)
+	}
+
+	fmt.Println("Build directory removed successfully.")
+}
+
 func NewSSEClient(ctx context.Context, method, url string) iter.Seq2[Event, error] {
 	return func(yield func(Event, error) bool) {
 		req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)