Skip to content

Commit 39eda94

Browse files
committed
fix error handling in test
1 parent da2c19e commit 39eda94

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

tests/integration/gpg_ssh_git_test.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,12 @@ func TestSSHGit(t *testing.T) {
8989
_, err = ssh.NewSignerFromKey(priv)
9090
require.NoError(t, err, "ssh.NewSignerFromKey")
9191

92-
os.WriteFile(tmpDir+"/id_ed25519.pub", []byte(ssh.MarshalAuthorizedKey(sshPubKey)), 0o600)
92+
err = os.WriteFile(tmpDir+"/id_ed25519.pub", ssh.MarshalAuthorizedKey(sshPubKey), 0o600)
93+
require.NoError(t, err, "os.WriteFile id_ed25519.pub")
9394
block, err := ssh.MarshalPrivateKey(priv, "")
94-
os.WriteFile(tmpDir+"/id_ed25519", []byte(pem.EncodeToMemory(block)), 0o600)
95+
require.NoError(t, err, "ssh.MarshalPrivateKey")
96+
err = os.WriteFile(tmpDir+"/id_ed25519", pem.EncodeToMemory(block), 0o600)
97+
require.NoError(t, err, "os.WriteFile id_ed25519")
9598

9699
defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, tmpDir+"/id_ed25519.pub")()
97100
defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "gitea")()
@@ -115,9 +118,12 @@ func TestSSHGitDefaults(t *testing.T) {
115118
_, err = ssh.NewSignerFromKey(priv)
116119
require.NoError(t, err, "ssh.NewSignerFromKey")
117120

118-
os.WriteFile(tmpDir+"/id_ed25519.pub", []byte(ssh.MarshalAuthorizedKey(sshPubKey)), 0o600)
121+
err = os.WriteFile(tmpDir+"/id_ed25519.pub", ssh.MarshalAuthorizedKey(sshPubKey), 0o600)
122+
require.NoError(t, err, "os.WriteFile id_ed25519.pub")
119123
block, err := ssh.MarshalPrivateKey(priv, "")
120-
os.WriteFile(tmpDir+"/id_ed25519", []byte(pem.EncodeToMemory(block)), 0o600)
124+
require.NoError(t, err, "ssh.MarshalPrivateKey")
125+
err = os.WriteFile(tmpDir+"/id_ed25519", pem.EncodeToMemory(block), 0o600)
126+
require.NoError(t, err, "os.WriteFile id_ed25519")
121127
os.WriteFile(tmpDir+"/.gitconfig", []byte(`
122128
[user]
123129
name = gitea

0 commit comments

Comments
 (0)