-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the intermittent TestGPGGit failures (#9360)
* Fix the intermittent TestGPGGit failures Reattempt to open the listener if the port is busy with a delay up to a second Switch from generating a private key each time, just use a known good key
- Loading branch information
Showing
28 changed files
with
11,803 additions
and
10,865 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,6 @@ import ( | |
| "io/ioutil" | ||
| "net/url" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "code.gitea.io/gitea/models" | ||
|
|
@@ -40,8 +39,11 @@ func TestGPGGit(t *testing.T) { | |
| defer os.Setenv("GNUPGHOME", oldGNUPGHome) | ||
|
|
||
| // Need to create a root key | ||
| rootKeyPair, err := createGPGKey(tmpDir, "gitea", "[email protected]") | ||
| rootKeyPair, err := importTestingKey(tmpDir, "gitea", "[email protected]") | ||
| assert.NoError(t, err) | ||
| if err != nil { | ||
| assert.FailNow(t, "Unable to import rootKeyPair") | ||
| } | ||
|
|
||
| rootKeyID := rootKeyPair.PrimaryKey.KeyIdShortString() | ||
|
|
||
|
|
@@ -125,6 +127,11 @@ func TestGPGGit(t *testing.T) { | |
| testCtx := NewAPITestContext(t, username, "initial-unsigned") | ||
| t.Run("CreateCRUDFile-Always", crudActionCreateFile( | ||
| t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) { | ||
| assert.NotNil(t, response.Verification) | ||
| if response.Verification == nil { | ||
| assert.FailNow(t, "no verification provided with response! %v", response) | ||
| return | ||
| } | ||
| assert.True(t, response.Verification.Verified) | ||
| if !response.Verification.Verified { | ||
| t.FailNow() | ||
|
|
@@ -134,6 +141,11 @@ func TestGPGGit(t *testing.T) { | |
| })) | ||
| t.Run("CreateCRUDFile-ParentSigned-always", crudActionCreateFile( | ||
| t, testCtx, user, "parentsigned", "parentsigned-always", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) { | ||
| assert.NotNil(t, response.Verification) | ||
| if response.Verification == nil { | ||
| assert.FailNow(t, "no verification provided with response! %v", response) | ||
| return | ||
| } | ||
| assert.True(t, response.Verification.Verified) | ||
| if !response.Verification.Verified { | ||
| t.FailNow() | ||
|
|
@@ -152,6 +164,11 @@ func TestGPGGit(t *testing.T) { | |
| testCtx := NewAPITestContext(t, username, "initial-unsigned") | ||
| t.Run("CreateCRUDFile-Always-ParentSigned", crudActionCreateFile( | ||
| t, testCtx, user, "always", "always-parentsigned", "signed-always-parentsigned.txt", func(t *testing.T, response api.FileResponse) { | ||
| assert.NotNil(t, response.Verification) | ||
| if response.Verification == nil { | ||
| assert.FailNow(t, "no verification provided with response! %v", response) | ||
| return | ||
| } | ||
| assert.True(t, response.Verification.Verified) | ||
| if !response.Verification.Verified { | ||
| t.FailNow() | ||
|
|
@@ -171,7 +188,15 @@ func TestGPGGit(t *testing.T) { | |
| t.Run("CreateRepository", doAPICreateRepository(testCtx, false)) | ||
| t.Run("CheckMasterBranchSigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) { | ||
| assert.NotNil(t, branch.Commit) | ||
| if branch.Commit == nil { | ||
| assert.FailNow(t, "no commit provided with branch! %v", branch) | ||
| return | ||
| } | ||
| assert.NotNil(t, branch.Commit.Verification) | ||
| if branch.Commit.Verification == nil { | ||
| assert.FailNow(t, "no verification provided with branch commit! %v", branch.Commit) | ||
| return | ||
| } | ||
| assert.True(t, branch.Commit.Verification.Verified) | ||
| if !branch.Commit.Verification.Verified { | ||
| t.FailNow() | ||
|
|
@@ -318,43 +343,26 @@ func crudActionCreateFile(t *testing.T, ctx APITestContext, user *models.User, f | |
| }, callback...) | ||
| } | ||
|
|
||
| func createGPGKey(tmpDir, name, email string) (*openpgp.Entity, error) { | ||
| keyPair, err := openpgp.NewEntity(name, "test", email, nil) | ||
| if err != nil { | ||
| func importTestingKey(tmpDir, name, email string) (*openpgp.Entity, error) { | ||
| if _, _, err := process.GetManager().Exec("gpg --import integrations/private-testing.key", "gpg", "--import", "integrations/private-testing.key"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| for _, id := range keyPair.Identities { | ||
| err := id.SelfSignature.SignUserId(id.UserId.Id, keyPair.PrimaryKey, keyPair.PrivateKey, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
|
|
||
| keyFile := filepath.Join(tmpDir, "temporary.key") | ||
| keyWriter, err := os.Create(keyFile) | ||
| keyringFile, err := os.Open("integrations/private-testing.key") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer keyWriter.Close() | ||
| defer os.Remove(keyFile) | ||
| defer keyringFile.Close() | ||
|
|
||
| w, err := armor.Encode(keyWriter, openpgp.PrivateKeyType, nil) | ||
| block, err := armor.Decode(keyringFile) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer w.Close() | ||
|
|
||
| keyPair.SerializePrivate(w, nil) | ||
| if err := w.Close(); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := keyWriter.Close(); err != nil { | ||
| return nil, err | ||
| keyring, err := openpgp.ReadKeyRing(block.Body) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Keyring access failed: '%v'", err) | ||
| } | ||
|
|
||
| if _, _, err := process.GetManager().Exec("gpg --import temporary.key", "gpg", "--import", keyFile); err != nil { | ||
| return nil, err | ||
| } | ||
| return keyPair, nil | ||
| // There should only be one entity in this file. | ||
| return keyring[0], nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| -----BEGIN PGP PRIVATE KEY BLOCK----- | ||
|
|
||
| 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 | ||
| =oSDR | ||
| -----END PGP PRIVATE KEY BLOCK----- |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.