Skip to content

Fix flaky test TestWithRsync/with_headless_tsh #33538

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
Joerger merged 3 commits into from
Oct 17, 2023
Merged

Fix flaky test TestWithRsync/with_headless_tsh #33538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a53b13
Improve error output for flaky test; Disable ssh agent to fix flaky t…
Joerger Oct 16, 2023
b216933
Skip TestWithRsync in flaky test detector because the test is too long.
Joerger Oct 16, 2023
c4d19bc
Merge branch 'master' into joerger/fix-flaky-test-TestWithRsync
Joerger Oct 17, 2023
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
5 changes: 4 additions & 1 deletion build.assets/tooling/cmd/difftest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ var (
// TestServer_Authenticate_headless takes about 4-5 seconds to run, so if other tests are changed
// in the same PR that take >1 second total, it may cause the flaky test detector to time out.
"TestServer_Authenticate_headless",

// TestWithRsync takes ~10 seconds to run
"TestWithRsync",
}
)

Expand Down Expand Up @@ -158,7 +161,7 @@ func diff(repoPath string, ref string, changedFiles []string, elapsed time.Durat

// test builds and prints go test flags
func test(repoPath string, ref string, changedFiles []string) {
var dirs = make(StringSet)
dirs := make(StringSet)
methods := make([]string, 0)

dollarSign := "$"
Expand Down
8 changes: 4 additions & 4 deletions tool/tsh/common/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ func TestSSHLoadAllCAs(t *testing.T) {

// TestWithRsync tests that Teleport works with rsync.
func TestWithRsync(t *testing.T) {
disableAgent(t)

_, err := exec.LookPath("rsync")
require.NoError(t, err)

Expand Down Expand Up @@ -478,13 +480,11 @@ func TestWithRsync(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
t.Cleanup(cancel)
cmd := tt.createCmd(ctx, testDir, srcPath, dstPath)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
out, err := cmd.CombinedOutput()
var msg string
var exitErr *exec.ExitError
if errors.As(err, &exitErr) {
msg = fmt.Sprintf("exit code: %d", exitErr.ExitCode())
msg = fmt.Sprintf("exit code: %d\nout: %s", exitErr.ExitCode(), out)
}
require.NoError(t, err, msg)

Expand Down