1bc6715 build(mocks): update mockery to v3.8.0 and regenerate mocks · neferwl

M .github/workflows/ci.yml +1 -1


@@ -9,7 +9,7 @@ jobs:
9	9		with:
10	10		go-version: '1.27'
11	11		- run: go install github.com/bnema/hexcheck@latest
12		-	- run: go install github.com/vektra/mockery/v3@v3.7.4
	12	+	- run: go install github.com/vektra/mockery/v3@v3.8.0
13	13		- run: make check
14	14		- run: make race
15	15		- run: make mocks-check


@@ -9,7 +9,7 @@ jobs:
9		with:	9		with:
10		go-version: '1.27'	10		go-version: '1.27'
11		- run: go install github.com/bnema/hexcheck@latest	11		- run: go install github.com/bnema/hexcheck@latest
12	-	- run: go install github.com/vektra/mockery/v3@v3.7.4	12	+	- run: go install github.com/vektra/mockery/v3@v3.8.0
13		- run: make check	13		- run: make check
14		- run: make race	14		- run: make race
15		- run: make mocks-check	15		- run: make mocks-check

M internal/adapters/drm/cursor_plane_mock_test.go +10 -1


@@ -14,10 +14,19 @@ func newMockcursorPlane(t interface {
14	14		mock.TestingT
15	15		Cleanup(func())
16	16		}) *mockcursorPlane {
	17	+	if helper, ok := t.(interface{ Helper() }); ok {
	18	+	helper.Helper()
	19	+	}
	20	+
17	21		mock := &mockcursorPlane{}
18	22		mock.Mock.Test(t)
19	23
20		-	t.Cleanup(func() { mock.AssertExpectations(t) })
	24	+	t.Cleanup(func() {
	25	+	if helper, ok := t.(interface{ Helper() }); ok {
	26	+	helper.Helper()
	27	+	}
	28	+	mock.AssertExpectations(t)
	29	+	})
21	30
22	31		return mock
23	32		}

 	mock.TestingT
 	Cleanup(func())
 }) *mockcursorPlane {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
 	mock := &mockcursorPlane{}
 	mock.Mock.Test(t)
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 	return mock
 }

M internal/adapters/statefile/proc_tree_mock_test.go +10 -1


@@ -14,10 +14,19 @@ func newMockprocTree(t interface {
14	14		mock.TestingT
15	15		Cleanup(func())
16	16		}) *mockprocTree {
	17	+	if helper, ok := t.(interface{ Helper() }); ok {
	18	+	helper.Helper()
	19	+	}
	20	+
17	21		mock := &mockprocTree{}
18	22		mock.Mock.Test(t)
19	23
20		-	t.Cleanup(func() { mock.AssertExpectations(t) })
	24	+	t.Cleanup(func() {
	25	+	if helper, ok := t.(interface{ Helper() }); ok {
	26	+	helper.Helper()
	27	+	}
	28	+	mock.AssertExpectations(t)
	29	+	})
21	30
22	31		return mock
23	32		}

 	mock.TestingT
 	Cleanup(func())
 }) *mockprocTree {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
 	mock := &mockprocTree{}
 	mock.Mock.Test(t)
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 	return mock
 }

M internal/adapters/wayland/proc_env_mock_test.go +10 -1


@@ -14,10 +14,19 @@ func newMockprocEnv(t interface {
14	14		mock.TestingT
15	15		Cleanup(func())
16	16		}) *mockprocEnv {
	17	+	if helper, ok := t.(interface{ Helper() }); ok {
	18	+	helper.Helper()
	19	+	}
	20	+
17	21		mock := &mockprocEnv{}
18	22		mock.Mock.Test(t)
19	23
20		-	t.Cleanup(func() { mock.AssertExpectations(t) })
	24	+	t.Cleanup(func() {
	25	+	if helper, ok := t.(interface{ Helper() }); ok {
	26	+	helper.Helper()
	27	+	}
	28	+	mock.AssertExpectations(t)
	29	+	})
21	30
22	31		return mock
23	32		}

 	mock.TestingT
 	Cleanup(func())
 }) *mockprocEnv {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
 	mock := &mockprocEnv{}
 	mock.Mock.Test(t)
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 	return mock
 }

M internal/mocks/ports/devices_mock.go +20 -2


@@ -17,10 +17,19 @@ func NewMockRenderer(t interface {
17	17		mock.TestingT
18	18		Cleanup(func())
19	19		}) *MockRenderer {
	20	+	if helper, ok := t.(interface{ Helper() }); ok {
	21	+	helper.Helper()
	22	+	}
	23	+
20	24		mock := &MockRenderer{}
21	25		mock.Mock.Test(t)
22	26
23		-	t.Cleanup(func() { mock.AssertExpectations(t) })
	27	+	t.Cleanup(func() {
	28	+	if helper, ok := t.(interface{ Helper() }); ok {
	29	+	helper.Helper()
	30	+	}
	31	+	mock.AssertExpectations(t)
	32	+	})
24	33
25	34		return mock
26	35		}

@@ -226,10 +235,19 @@ func NewMockSeat(t interface {
226	235		mock.TestingT
227	236		Cleanup(func())
228	237		}) *MockSeat {
	238	+	if helper, ok := t.(interface{ Helper() }); ok {
	239	+	helper.Helper()
	240	+	}
	241	+
229	242		mock := &MockSeat{}
230	243		mock.Mock.Test(t)
231	244
232		-	t.Cleanup(func() { mock.AssertExpectations(t) })
	245	+	t.Cleanup(func() {
	246	+	if helper, ok := t.(interface{ Helper() }); ok {
	247	+	helper.Helper()
	248	+	}
	249	+	mock.AssertExpectations(t)
	250	+	})
233	251
234	252		return mock
235	253		}

 	mock.TestingT
 	Cleanup(func())
 }) *MockRenderer {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
 	mock := &MockRenderer{}
 	mock.Mock.Test(t)
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 	return mock
 }
 	mock.TestingT
 	Cleanup(func())
 }) *MockSeat {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
 	mock := &MockSeat{}
 	mock.Mock.Test(t)
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 	return mock
 }