Skip to content

Commit 800c8c4

Browse files
sdodsonclaude
andcommitted
DOWNSTREAM: <drop>: Remove stale tests/integration/cluster.go
This file was a carry from the v3.5 era that duplicated tests/framework/integration/cluster.go. It referenced removed upstream packages and functions (raft/v3, MustAbsPath, bridge, newClientV3) and could not compile. The upstream framework version is the canonical implementation; the local integration package only needs lazy_cluster.go and the test files. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent fe7e37b commit 800c8c4

2 files changed

Lines changed: 3 additions & 1685 deletions

File tree

CLAUDE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,14 @@ These files are downstream-only and don't exist in upstream etcd:
127127
- `client/v3/patch_cluster.go` - Downstream client patch (NonLinearizeableMemberList)
128128
- `server/revbump/` - Downstream revision bumping for force-new-cluster
129129
- `server/config/config.go` - Has downstream additions (OPENSHIFT_ETCD_HARDWARE_DELAY_TIMEOUT)
130-
- `tests/integration/cluster.go` - Downstream test cluster helper (references upstream internal APIs that change between versions)
131130
- `REBASE.openshift.md` - Additional rebase documentation
132131

132+
**Removed files (do not re-add):**
133+
- `tests/integration/cluster.go` - Removed during v3.6.9 rebase. Was a stale carry from v3.5 that duplicated `tests/framework/integration/cluster.go` and could not compile (referenced many removed upstream symbols). The `tests/integration/` package works without it — `lazy_cluster.go` and test files import from `tests/framework/integration` for the actual cluster implementation. If this file reappears in future carries, remove it again.
134+
133135
## Known Fragile Downstream Files
134136

135137
These files reference upstream internal APIs and are most likely to break during a rebase:
136138

137-
- `tests/integration/cluster.go` - Large downstream carry that mirrors `tests/framework/integration/cluster.go`. When imports break, check the upstream framework version for the current API.
138139
- `client/v3/patch_cluster.go` - Uses internal client functions that may be renamed upstream.
139140
- `openshift-tools/pkg/discover-etcd-initial-cluster/walutil.go` - Imports server-internal packages (wal, datadir, snap) that move during upstream refactors.

0 commit comments

Comments
 (0)