Skip to content

fix: Remove invalid HTTPS redirect test fixture #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnikolova82 merged 11 commits into from
Jan 12, 2026
Merged

fix: Remove invalid HTTPS redirect test fixture #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
01a72ed
fix: Remove invalid HTTPS redirect test fixture and add platform-spec…
tnikolova82 Jan 9, 2026
67e7062
Merge branch 'master' into integration_tests
tnikolova82 Jan 9, 2026
981f8c1
fixing it.After()
tnikolova82 Jan 9, 2026
dba47c9
fix
tnikolova82 Jan 9, 2026
3a66136
removing docker platfrom check
tnikolova82 Jan 9, 2026
2bca8bc
added comment
tnikolova82 Jan 9, 2026
2e97e4a
adding docker checks and proper handling
tnikolova82 Jan 9, 2026
1541ee0
Merge branch 'master' into integration_tests
tnikolova82 Jan 9, 2026
ab5b768
removed Focus
tnikolova82 Jan 9, 2026
9915798
wqerge remote-tracking branch 'origin/master' into integration_tests
tnikolova82 Jan 11, 2026
cf992cf
Remove incorrect type assertion 'logs.(string)' from runtime logs
tnikolova82 Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions fixtures/https_redirect/with_env/manifest.yml
View file
Open in desktop

This file was deleted.

24 changes: 13 additions & 11 deletions src/staticfile/integration/default_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
t.Logf("❌ FAILED TEST - App/Container: %s", name)
t.Logf(" Platform: %s", settings.Platform)
}
if name != "" && (!settings.KeepFailedContainers || !t.Failed()) {
if name != "" && !t.Skipped() && (!settings.KeepFailedContainers || !t.Failed()) {
Expect(platform.Delete.Execute(name)).To(Succeed())
}
})
Expand Down Expand Up @@ -90,16 +90,18 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T

Expect(contents).To(ContainSubstring("404 Not Found"), string(contents))

cmd := exec.Command("docker", "container", "logs", deployment.Name)

output, err := cmd.CombinedOutput()
Expect(err).NotTo(HaveOccurred())

Expect(string(output)).To(ContainSubstring("GET / HTTP/1.1"))
Expect(string(output)).To(ContainSubstring("GET /does-not-exist HTTP/1.1"))

cmd = exec.Command("docker", "container", "exec", deployment.Name, "stat", "app/nginx/logs/access.log", "app/nginx/logs/error.log")
Expect(cmd.Run()).To(Succeed())
Eventually(func() string {
logs, _ := deployment.RuntimeLogs()
return logs
}, "10s", "1s").Should(Or(
ContainSubstring("GET / HTTP/1.1"),
ContainSubstring("GET /does-not-exist HTTP/1.1"),
))

if settings.Platform == "docker" {
cmd := exec.Command("docker", "container", "exec", deployment.Name, "stat", "app/nginx/logs/access.log", "app/nginx/logs/error.log")
Expect(cmd.Run()).To(Succeed())
}
})
})

Expand Down
Loading