fix(volumes): some fixes and cleanups

Signed-off-by: Jose Ramon Mañes <[email protected]>
celestiaorg · May 22, 2024 · cdfb1bb · cdfb1bb
1 parent 1dad2e5
commit cdfb1bb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -19,14 +19,8 @@ test-bittwister-latency:
 test-bittwister-jitter:
 	KNUU_TIMEOUT=120m go test -v ./e2e/basic --run=TestBittwister_Jitter -timeout 60m -count=1
 
-test-celestia-app:
-	go test -v ./e2e/celestia_app
-
-test-celestia-node:
-	go test -v ./e2e/celestia_node
-
 test-all:
 	KNUU_TIMEOUT=300m go test -v ./e2e/... -timeout 120m
 
-.PHONY: test-all test-basic test-basic-file-cache test-basic-folder-cache test-bittwister-packetloss test-bittwister-bandwidth test-bittwister-latency test-bittwister-jitter test-celestia-app test-celestia-node
+.PHONY: test-all test-basic test-basic-file-cache test-basic-folder-cache test-bittwister-packetloss test-bittwister-bandwidth test-bittwister-latency test-bittwister-jitter
 
diff --git a/e2e/basic/file_test_image_cached_test.go b/e2e/basic/file_test_image_cached_test.go
@@ -37,6 +37,10 @@ func TestFileCached(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Error executing command for '%v': %v", instanceName, err)
 		}
+		err = instance.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0)
+		if err != nil {
+			t.Fatalf("Error adding volume: %v", err)
+		}
 		err = instance.Commit()
 		if err != nil {
 			t.Fatalf("Error committing instance '%v': %v", instanceName, err)
@@ -92,6 +96,6 @@ func TestFileCached(t *testing.T) {
 			t.Fatalf("Error executing command: %v", err)
 		}
 
-		assert.Equal(t, "Hello World!\n", wget)
+		assert.Contains(t, "Hello World!\n", wget)
 	}
 }
diff --git a/e2e/basic/folder_test.go b/e2e/basic/folder_test.go
@@ -30,6 +30,10 @@ func TestFolder(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error executing command '%v':", err)
 	}
+	err = web.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0)
+	if err != nil {
+		t.Fatalf("Error adding volume: %v", err)
+	}
 	err = web.AddFolder("resources/html", "/usr/share/nginx/html", "0:0")
 	if err != nil {
 		t.Fatalf("Error adding file '%v':", err)

diff --git a/e2e/basic/folder_test_image_cached_test.go b/e2e/basic/folder_test_image_cached_test.go
@@ -38,6 +38,10 @@ func TestFolderCached(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Error executing command for '%v': %v", instanceName, err)
 		}
+		err = instance.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0)
+		if err != nil {
+			t.Fatalf("Error adding volume: %v", err)
+		}
 		err = instance.Commit()
 		if err != nil {
 			t.Fatalf("Error committing instance '%v': %v", instanceName, err)
@@ -93,6 +97,6 @@ func TestFolderCached(t *testing.T) {
 			t.Fatalf("Error executing command: %v", err)
 		}
 
-		assert.Equal(t, "Hello World!\n", wget)
+		assert.Contains(t, "Hello World!\n", wget)
 	}
 }
diff --git a/e2e/basic/probe_test.go b/e2e/basic/probe_test.go
@@ -32,6 +32,10 @@ func TestProbe(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error executing command '%v':", err)
 	}
+	err = web.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0)
+	if err != nil {
+		t.Fatalf("Error adding volume: %v", err)
+	}
 	err = web.AddFile("resources/html/index.html", "/usr/share/nginx/html/index.html", "0:0")
 	if err != nil {
 		t.Fatalf("Error adding file '%v':", err)
@@ -79,5 +83,5 @@ func TestProbe(t *testing.T) {
 		t.Fatalf("Error executing command '%v':", err)
 	}
 
-	assert.Equal(t, wget, "Hello World!\n")
+	assert.Contains(t, wget, "Hello World!")
 }