Compare commits

..

No commits in common. "e7e0fe03bbce4921675e6ccaccf176cb6a812ead" and "9682755e25bb2267768b8901c7574fe7134f86d7" have entirely different histories.

2 changed files with 8 additions and 16 deletions

View file

@ -31,7 +31,6 @@ jobs:
go: ['1.23'] go: ['1.23']
env: env:
PERFORM_ONLINE_TEST: ${{ vars.PERFORM_ONLINE_TEST }} PERFORM_ONLINE_TEST: ${{ vars.PERFORM_ONLINE_TEST }}
PERFORM_UNIX_OPEN_WRITE_TESTS: "true"
TEST_SENDMAIL: ${{ vars.TEST_SENDMAIL }} TEST_SENDMAIL: ${{ vars.TEST_SENDMAIL }}
TEST_HOST: ${{ secrets.TEST_HOST }} TEST_HOST: ${{ secrets.TEST_HOST }}
TEST_USER: ${{ secrets.TEST_USER }} TEST_USER: ${{ secrets.TEST_USER }}
@ -145,7 +144,7 @@ jobs:
cancel-in-progress: true cancel-in-progress: true
strategy: strategy:
matrix: matrix:
osver: ['14.1', '14.0', 13.4'] osver: ['13.4', '14.0', '14.1']
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
@ -153,11 +152,9 @@ jobs:
uses: vmactions/freebsd-vm@v1 uses: vmactions/freebsd-vm@v1
with: with:
usesh: true usesh: true
copyback: false
prepare: | prepare: |
pkg install -y go pkg install -y go
run: | run: |
cd $GITHUB_WORKSPACE;
go test -race -shuffle=on ./... go test -race -shuffle=on ./...
reuse: reuse:
name: REUSE Compliance Check name: REUSE Compliance Check

View file

@ -2,8 +2,8 @@
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
//go:build linux || freebsd //go:build !windows
// +build linux freebsd // +build !windows
package mail package mail
@ -18,28 +18,23 @@ import (
func TestMsg_AttachFile_unixOnly(t *testing.T) { func TestMsg_AttachFile_unixOnly(t *testing.T) {
t.Run("AttachFile with fileFromFS fails on open", func(t *testing.T) { t.Run("AttachFile with fileFromFS fails on open", func(t *testing.T) {
if os.Getenv("PERFORM_UNIX_OPEN_WRITE_TESTS") != "true" { tempfile, err := os.CreateTemp("testdata/tmp", "attachfile-unable-to-open.*.txt")
t.Skipf("PERFORM_UNIX_OPEN_WRITE_TESTS variable is not set. Skipping unix open/write tests")
}
tempFile, err := os.CreateTemp("testdata/tmp", "attachfile-open-write-test.*.txt")
if err != nil { if err != nil {
t.Fatalf("failed to create temp file: %s", err) t.Fatalf("failed to create temp file: %s", err)
} }
t.Cleanup(func() { t.Cleanup(func() {
if err := os.Remove(tempFile.Name()); err != nil { if err := os.Remove(tempfile.Name()); err != nil {
t.Errorf("failed to remove temp file: %s", err) t.Errorf("failed to remove temp file: %s", err)
} }
}) })
if err = os.Chmod(tempFile.Name(), 0o000); err != nil { if err = os.Chmod(tempfile.Name(), 0o000); err != nil {
t.Fatalf("failed to chmod temp file: %s", err) t.Fatalf("failed to chmod temp file to 0000: %s", err)
} }
message := NewMsg() message := NewMsg()
if message == nil { if message == nil {
t.Fatal("message is nil") t.Fatal("message is nil")
} }
message.AttachFile(tempFile.Name()) message.AttachFile(tempfile.Name())
attachments := message.GetAttachments() attachments := message.GetAttachments()
if len(attachments) != 1 { if len(attachments) != 1 {
t.Fatalf("failed to get attachments, expected 1, got: %d", len(attachments)) t.Fatalf("failed to get attachments, expected 1, got: %d", len(attachments))