From c7a8d4fd76fde5664313a34c54faff2f4b9bdeff Mon Sep 17 00:00:00 2001
From: Travis Ralston <travis@t2bot.io>
Date: Mon, 19 Feb 2024 23:22:37 -0700
Subject: [PATCH] Fix URL preview test

---
 ...sc3916_misc_client_endpoints_suite_test.go |  4 +++
 test/test_internals/deps.go                   | 32 +++++++++++--------
 test/test_internals/inline_dep_host_file.go   | 11 +++++++
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/test/msc3916_misc_client_endpoints_suite_test.go b/test/msc3916_misc_client_endpoints_suite_test.go
index dac970e3..2aaa2cb3 100644
--- a/test/msc3916_misc_client_endpoints_suite_test.go
+++ b/test/msc3916_misc_client_endpoints_suite_test.go
@@ -33,6 +33,10 @@ func (s *MSC3916MiscClientEndpointsSuite) SetupSuite() {
 
 func (s *MSC3916MiscClientEndpointsSuite) TearDownSuite() {
 	if s.htmlPage != nil {
+		if s.T().Failed() {
+			staticLogs, err := s.htmlPage.Logs()
+			s.deps.DumpDebugLogs(staticLogs, err, -1, s.htmlPage.PublicUrl)
+		}
 		s.htmlPage.Teardown()
 	}
 	if s.deps != nil {
diff --git a/test/test_internals/deps.go b/test/test_internals/deps.go
index 18ba27dd..da0c65db 100644
--- a/test/test_internals/deps.go
+++ b/test/test_internals/deps.go
@@ -182,19 +182,23 @@ func (c *ContainerDeps) Teardown() {
 func (c *ContainerDeps) Debug() {
 	for i, m := range c.Machines {
 		logs, err := m.Logs()
-		if err != nil {
-			log.Fatal(err)
-		}
-		b, err := io.ReadAll(logs)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("[MMR Deps] Logs from index %d (%s)", i, m.HttpUrl)
-		fmt.Println()
-		fmt.Println(string(b))
-		err = logs.Close()
-		if err != nil {
-			log.Fatal(err)
-		}
+		c.DumpDebugLogs(logs, err, i, m.HttpUrl)
+	}
+}
+
+func (c *ContainerDeps) DumpDebugLogs(logs io.ReadCloser, err error, i int, url string) {
+	if err != nil {
+		log.Fatal(err)
+	}
+	b, err := io.ReadAll(logs)
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Printf("[MMR Deps] Logs from index %d (%s)", i, url)
+	fmt.Println()
+	fmt.Println(string(b))
+	err = logs.Close()
+	if err != nil {
+		log.Fatal(err)
 	}
 }
diff --git a/test/test_internals/inline_dep_host_file.go b/test/test_internals/inline_dep_host_file.go
index dd486052..5fc9cf17 100644
--- a/test/test_internals/inline_dep_host_file.go
+++ b/test/test_internals/inline_dep_host_file.go
@@ -1,7 +1,9 @@
 package test_internals
 
 import (
+	"context"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"path"
@@ -24,6 +26,11 @@ func ServeFile(fileName string, deps *ContainerDeps, contents string) (*HostedFi
 		return nil, err
 	}
 
+	err = os.Chmod(tmp, 0755)
+	if err != nil {
+		return nil, err
+	}
+
 	f, err := os.Create(path.Join(tmp, fileName))
 	if err != nil {
 		return nil, err
@@ -80,3 +87,7 @@ func (f *HostedFile) Teardown() {
 		log.Fatalf("Error cleaning up temporarily hosted file: %s", err.Error())
 	}
 }
+
+func (f *HostedFile) Logs() (io.ReadCloser, error) {
+	return f.nginx.Logs(context.Background())
+}