Skip to content

simulators/ethereum/consensus: split test suites #1130

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
fjl merged 4 commits into from
Jul 15, 2024
Merged

simulators/ethereum/consensus: split test suites #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fc644c
consensus simulator args
winsvega Jun 27, 2024
6ec7603
simulators/ethereum/consensus: split into suites
fjl Jul 15, 2024
c382575
simulators/ethereum/consensus: fix path
fjl Jul 15, 2024
ac31216
revert argument additions
fjl Jul 15, 2024
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
4 changes: 2 additions & 2 deletions simulators/ethereum/consensus/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM golang:1-alpine as builder
RUN apk add --update git ca-certificates gcc musl-dev linux-headers

# Clone the tests repo.
RUN git clone --depth 1 https://github.com/ethereum/tests.git /tests
RUN git clone --depth 1 --recurse-submodules https://github.com/ethereum/tests.git /tests

# Build the simulator executable.
ADD . /source
Expand All @@ -18,4 +18,4 @@ COPY --from=builder /source/consensus .
COPY --from=builder /tests /tests
ENV TESTPATH /tests

ENTRYPOINT ["./consensus"]
ENTRYPOINT ["./consensus"]
33 changes: 24 additions & 9 deletions simulators/ethereum/consensus/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,21 @@ import (
)

func main() {
suites := []hivesim.Suite{
makeSuite("consensus", "BlockchainTests"),
makeSuite("legacy", "LegacyTests/Constantinople/BlockchainTests"),
makeSuite("legacy-cancun", "LegacyTests/Cancun/BlockchainTests"),
}
client := hivesim.New()
for _, suite := range suites {
hivesim.MustRunSuite(client, suite)
}
}

func makeSuite(name string, testsDirectory string) hivesim.Suite {
suite := hivesim.Suite{
Name: "consensus",
Description: "The 'consensus' test suite executes BlockchainTests from the " +
Name: name,
Description: "The '" + name + "' test suite executes BlockchainTests from the " +
"official test repository (https://github.com/ethereum/tests). For every test, it starts an instance of the client, " +
"and makes it import the RLP blocks. After import phase, the node is queried about it's latest blocks, which is matched " +
"to the expected last blockhash according to the test.",
Expand All @@ -32,14 +44,16 @@ func main() {
Description: "This is a meta-test. It loads the blockchain test files and " +
"launches the actual client tests. Any errors in test files will be reported " +
"through this test.",
Run: loaderTest,
Run: func(t *hivesim.T) {
runTestsLoader(t, testsDirectory)
},
AlwaysRun: true,
})
hivesim.MustRunSuite(hivesim.New(), suite)
return suite
}

// loaderTest loads the blockchain test files and spawns the client tests.
func loaderTest(t *hivesim.T) {
// runTestsLoader loads the blockchain test files and spawns the client tests.
func runTestsLoader(t *hivesim.T, testsDirectory string) {
clientTypes, err := t.Sim.ClientTypes()
if err != nil {
t.Fatal("can't get client types:", err)
Expand All @@ -56,11 +70,12 @@ func loaderTest(t *hivesim.T) {
t.Log("parallelism:", parallelism)

// Find the tests directory.
testPath, isset := os.LookupEnv("TESTPATH")
basePath, isset := os.LookupEnv("TESTPATH")
if !isset {
t.Fatal("$TESTPATH not set")
}
fileRoot := fmt.Sprintf("%s/BlockchainTests/", testPath)
t.Log("testsDirectory:", testsDirectory)
fileRoot := filepath.Join(basePath, testsDirectory)

// Spawn workers.
var wg sync.WaitGroup
Expand Down Expand Up @@ -119,7 +134,7 @@ func testLink(filepath string) string {
func loadTests(t *hivesim.T, root string, re *regexp.Regexp, fn func(testcase)) {
filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
if err != nil {
t.Logf("unable to walk path: %s", err)
t.Errorf("unable to walk path: %s", err)
return err
}
if info.IsDir() {
Expand Down