-
-
Notifications
You must be signed in to change notification settings - Fork 405
[skip-changelog] Some integration test refactorings #1911
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.
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
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c10727e
Integrated 'go.bug.st/testsuite'
cmaglie 0fd789d
Do not use shared download dir for 'cache clean' command tests
cmaglie c784da7
Added method to get cli download dir
cmaglie 1048ceb
Create infra for sharing directories between tests
cmaglie 8c7a08a
Slighlty improved test output
cmaglie 0c8938e
Non-parallel testing is no longer required
cmaglie 1cb8d07
Add more time to complete tests
cmaglie 77094fa
Update internal/integrationtest/cache/cache_test.go
cmaglie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,78 @@ | ||
| // This file is part of arduino-cli. | ||
| // | ||
| // Copyright 2022 ARDUINO SA (http://www.arduino.cc/) | ||
| // | ||
| // This software is released under the GNU General Public License version 3, | ||
| // which covers the main part of arduino-cli. | ||
| // The terms of this license can be found at: | ||
| // https://www.gnu.org/licenses/gpl-3.0.en.html | ||
| // | ||
| // You can be released from the requirements of the above licenses by purchasing | ||
| // a commercial license. Buying such a license is mandatory if you want to | ||
| // modify or otherwise use the software for commercial activities involving the | ||
| // Arduino software without disclosing the source code of your own applications. | ||
| // To purchase a commercial license, send an email to license@arduino.cc. | ||
|
|
||
| package integrationtest | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/arduino/go-paths-helper" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // ProjectName is the prefix used in the test temp files | ||
| var ProjectName = "cli" | ||
|
|
||
| // Environment is a test environment for the test suite. | ||
| type Environment struct { | ||
| rootDir *paths.Path | ||
| downloadsDir *SharedDir | ||
| t *testing.T | ||
| cleanUp func() | ||
| } | ||
|
|
||
| // NewEnvironment creates a new test environment. | ||
| func NewEnvironment(t *testing.T) *Environment { | ||
| downloadsDir := NewSharedDir(t, "downloads") | ||
| rootDir, err := paths.MkTempDir("", ProjectName) | ||
| require.NoError(t, err) | ||
| return &Environment{ | ||
| rootDir: rootDir, | ||
| downloadsDir: downloadsDir, | ||
| t: t, | ||
| cleanUp: func() { | ||
| require.NoError(t, rootDir.RemoveAll()) | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| // RegisterCleanUpCallback adds a clean up function to the clean up chain | ||
| func (e *Environment) RegisterCleanUpCallback(newCleanUp func()) { | ||
| previousCleanUp := e.cleanUp | ||
| e.cleanUp = func() { | ||
| newCleanUp() | ||
| previousCleanUp() | ||
| } | ||
| } | ||
|
|
||
| // CleanUp removes the test environment. | ||
| func (e *Environment) CleanUp() { | ||
| e.cleanUp() | ||
| } | ||
|
|
||
| // RootDir returns the root dir of the environment. | ||
| func (e *Environment) RootDir() *paths.Path { | ||
| return e.rootDir | ||
| } | ||
|
|
||
| // SharedDownloadsDir return the shared directory for downloads | ||
| func (e *Environment) SharedDownloadsDir() *SharedDir { | ||
| return e.downloadsDir | ||
| } | ||
|
|
||
| // T returns the testing environment | ||
| func (e *Environment) T() *testing.T { | ||
| return e.t | ||
| } |
This file contains hidden or 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,53 @@ | ||
| // This file is part of arduino-cli. | ||
| // | ||
| // Copyright 2022 ARDUINO SA (http://www.arduino.cc/) | ||
| // | ||
| // This software is released under the GNU General Public License version 3, | ||
| // which covers the main part of arduino-cli. | ||
| // The terms of this license can be found at: | ||
| // https://www.gnu.org/licenses/gpl-3.0.en.html | ||
| // | ||
| // You can be released from the requirements of the above licenses by purchasing | ||
| // a commercial license. Buying such a license is mandatory if you want to | ||
| // modify or otherwise use the software for commercial activities involving the | ||
| // Arduino software without disclosing the source code of your own applications. | ||
| // To purchase a commercial license, send an email to license@arduino.cc. | ||
|
|
||
| package integrationtest | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
| "net/url" | ||
|
|
||
| "github.com/arduino/go-paths-helper" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // HTTPServeFile spawn an http server that serve a single file. The server | ||
| // is started on the given port. The URL to the file and a cleanup function are returned. | ||
| func (env *Environment) HTTPServeFile(port uint16, path *paths.Path) *url.URL { | ||
| mux := http.NewServeMux() | ||
| mux.HandleFunc("/"+path.Base(), func(w http.ResponseWriter, r *http.Request) { | ||
| http.ServeFile(w, r, path.String()) | ||
| }) | ||
| server := &http.Server{ | ||
| Addr: fmt.Sprintf(":%d", port), | ||
| Handler: mux, | ||
| } | ||
|
|
||
| t := env.T() | ||
| fileURL, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d/%s", port, path.Base())) | ||
| require.NoError(t, err) | ||
|
|
||
| go func() { | ||
| err := server.ListenAndServe() | ||
| require.Equal(t, err, http.ErrServerClosed) | ||
| }() | ||
|
|
||
| env.RegisterCleanUpCallback(func() { | ||
| server.Close() | ||
| }) | ||
|
|
||
| return fileURL | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.