Merged
Conversation
github-actions
bot
added
audit-log
zmb3
approved these changes
Oct 31, 2025
rosstimothy
approved these changes
Oct 31, 2025
public-teleport-github-review-bot
bot
removed request for
eriktate and
gzdunek
Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
Joerger
commented
Oct 31, 2025
Comment on lines
-131
to
-138
| { | ||
| desc: "OnlyReservation", | ||
| expectedContent: []byte{}, | ||
| partsFunc: func(t *testing.T, handler *Handler, upload *events.StreamUpload) { | ||
| createPart(t, handler, upload, int64(1), []byte{}) | ||
| createPart(t, handler, upload, int64(2), []byte{}) | ||
| }, | ||
| }, |
Contributor
Author
There was a problem hiding this comment.
@rosstimothy FYI I had to remove this test as it was basically ensuring that we do upload empty uploads if we find an empty upload instead of discarding it.
rosstimothy
reviewed
Nov 3, 2025
|
|
||
| gotContent, err := io.ReadAll(f) | ||
| require.NoError(t, err) | ||
| require.Equal(t, content, gotContent) |
Contributor
There was a problem hiding this comment.
Let's take a closer look at this fix since test is failing in CI.
Error: Not equal:
expected: []byte{0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64}
actual : []byte{}
Diff:
--- Expected
+++ Actual
@@ -1,3 +1,2 @@
-([]uint8) (len=11) {
- 00000000 68 65 6c 6c 6f 20 77 6f 72 6c 64 |hello world|
+([]uint8) {
}
Test: TestCleanupEmptyUpload
Contributor
Author
There was a problem hiding this comment.
This was caused by 9177f92, reverted. Sorry for the haphazard change, in addition to being done wrong, I don't think it's necessary.
This reverts commit 9177f92.
rosstimothy
approved these changes
Nov 3, 2025
Contributor
Joerger
added a commit
that referenced
this pull request
Nov 3, 2025
* Cleanup empty uploads rather than completing them. * Add regression test. * Update lib/events/filesessions/filestream_test.go Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com> * Remove test for uploading an empty reservation upload. * Cleanup after FS lock. * Revert "Cleanup after FS lock." This reverts commit 9177f92. --------- Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 8, 2025
* Cleanup empty uploads rather than completing them. * Add regression test. * Update lib/events/filesessions/filestream_test.go * Remove test for uploading an empty reservation upload. * Cleanup after FS lock. * Revert "Cleanup after FS lock." This reverts commit 9177f92. --------- Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
mmcallister
pushed a commit
that referenced
this pull request
Nov 19, 2025
* Cleanup empty uploads rather than completing them. * Add regression test. * Update lib/events/filesessions/filestream_test.go Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com> * Remove test for uploading an empty reservation upload. * Cleanup after FS lock. * Revert "Cleanup after FS lock." This reverts commit 9177f92. --------- Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
mmcallister
pushed a commit
that referenced
this pull request
Nov 20, 2025
* Cleanup empty uploads rather than completing them. * Add regression test. * Update lib/events/filesessions/filestream_test.go Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com> * Remove test for uploading an empty reservation upload. * Cleanup after FS lock. * Revert "Cleanup after FS lock." This reverts commit 9177f92. --------- Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Changelog: fix an issue which could lead to session recordings saved on disk being truncated.
Fixes #60860