Skip to content

TOOLS-4319 Fix TestReadDumpServerVersionFromArchive to work when run with all Server builds #1103

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

Open
autarch wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −2
Open

TOOLS-4319 Fix TestReadDumpServerVersionFromArchive to work when run with all Server builds #1103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions mongorestore/mongorestore_archive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"testing"

"github.com/mongodb/mongo-tools/common/archive"
"github.com/mongodb/mongo-tools/common/db"
"github.com/mongodb/mongo-tools/common/log"
"github.com/mongodb/mongo-tools/common/options"
"github.com/mongodb/mongo-tools/common/testtype"
Expand Down Expand Up @@ -174,8 +175,20 @@ func TestReadDumpServerVersionFromArchive(t *testing.T) {
defer restore.Close()

_ = restore.Restore()
expectedVersion, _ := sessionProvider.ServerVersionArray()
require.Equal(restore.dumpServerVersion, expectedVersion)

// The prelude records the server's version *string*, so compare against
// that same source. buildInfo.versionArray reports the next, unreleased
// version for source builds (8.0.16-353-gb19191c has a versionArray of
// [8, 0, 17, -100]), which would not match.
serverVersionStr, err := sessionProvider.ServerVersion()
require.NoError(err)
expectedVersion, err := db.StrToVersion(serverVersionStr)

@mattb-mdb mattb-mdb Aug 11, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is checking this error but L379 in mongorestore.go has restore.dumpServerVersion, _ = db.StrToVersion(dumpServerVersionStr) - shouldn't that follow the same pattern and at least check the error rather than discard it?

@autarch autarch Aug 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably should, but that's much earlier work. @FGasper It looks like you wrote that. Do you remember why this doesn't check the error, by any chance?

@autarch autarch Aug 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Felipe is out until next week, and I don't think this needs to block merging this test change.

@mattb-mdb mattb-mdb Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commenting just to postpone this at least until the release process for tools is complete.

@mattb-mdb mattb-mdb Aug 17, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumping this comment & adding Felipe as reviewer.

require.NoError(err)
require.Equal(
expectedVersion,
restore.dumpServerVersion,
"dumpServerVersion matches the version reported by the server",
)
})
}

Expand Down