Skip to content

Fix tests on Windows #15

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
mrmelon54 merged 3 commits into from
Mar 29, 2026
Merged

Fix tests on Windows #15

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b86e8f
Fix agent tests on Windows.
Captain-ALM Mar 28, 2026
d9732d6
Fix agent path joining for scp.
Captain-ALM Mar 28, 2026
a1aff57
Switch to runtime.GOOS for agent_test.go
Captain-ALM Mar 28, 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
6 changes: 4 additions & 2 deletions agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/gobuffalo/nulls"
"golang.org/x/crypto/ssh"
"os"
"path"
"path/filepath"
"sync"
"time"
Expand Down Expand Up @@ -220,11 +221,12 @@ func (a *Agent) copySingleCertPair(scpClient *scp.Client, row database.FindAgent
defer openKey.Close()

// copy cert and key to agent
err = scpClient.CopyFromFile(context.Background(), *openCert, filepath.Join(row.Dir, "certificates", certName), "0600")
// use path rather than filepath here as scpClient unfortunately uses path.Base rather than filepath.Base
err = scpClient.CopyFromFile(context.Background(), *openCert, path.Join(row.Dir, "certificates", certName), "0600")
if err != nil {
return fmt.Errorf("copy cert file: %w", err)
}
err = scpClient.CopyFromFile(context.Background(), *openKey, filepath.Join(row.Dir, "keys", keyName), "0600")
err = scpClient.CopyFromFile(context.Background(), *openKey, path.Join(row.Dir, "keys", keyName), "0600")
if err != nil {
return fmt.Errorf("copy cert file: %w", err)
}
Expand Down
5 changes: 3 additions & 2 deletions agent/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"fmt"
"github.com/1f349/orchid/database"
"github.com/1f349/orchid/logger"
"github.com/1f349/orchid/test"
"github.com/charmbracelet/log"
"github.com/gobuffalo/nulls"
"github.com/mrmelon54/certgen"
Expand Down Expand Up @@ -79,7 +80,7 @@ func TestAgentSyncing(t *testing.T) {
CertNotAfter: nulls.NewTime(now),
})
assert.Contains(t, err.Error(), "open cert file:")
assert.Contains(t, err.Error(), "no such file or directory")
assert.Contains(t, err.Error(), test.PathErrorMessageStringComponent)
Comment thread
Captain-ALM marked this conversation as resolved.
Outdated
})

// generate example certificate
Expand Down Expand Up @@ -112,7 +113,7 @@ func TestAgentSyncing(t *testing.T) {
CertNotAfter: nulls.NewTime(now),
})
assert.Contains(t, err.Error(), "open key file:")
assert.Contains(t, err.Error(), "no such file or directory")
assert.Contains(t, err.Error(), test.PathErrorMessageStringComponent)
})

err = os.WriteFile(filepath.Join(keyDir, "420.key.pem"), tlsCert.GetKeyPem(), 0600)
Expand Down
5 changes: 5 additions & 0 deletions test/not_win.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//go:build !windows

package test

const PathErrorMessageStringComponent = "no such file or directory"
5 changes: 5 additions & 0 deletions test/win.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//go:build windows

package test

const PathErrorMessageStringComponent = "system cannot find the file specified"
Loading