fix(services): update test mock expectations for NewBootloaderHandler signature and Stat calls
- commit
- 83effce6250a92e6381bc5850b31bcdbcdb15aa8
- author
- brice · · 2026-02-27 05:40 UTC
- parent
- adcf282
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
1 file · +4 -2
M internal/application/services/installation_service_test.go +4 -2
| @@ -49,6 +49,7 @@ func createTestService(ctrl *gomock.Controller) *InstallationService { | |||
| 49 | 49 | mockFS.EXPECT().WriteFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | |
| 50 | 50 | mockFS.EXPECT().MkdirAll(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | |
| 51 | 51 | mockFS.EXPECT().Chmod(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | |
| 52 | + | mockFS.EXPECT().Stat(gomock.Any()).Return(nil, nil).AnyTimes() | |
| 52 | 53 | mockHTTP.EXPECT().Get(gomock.Any()).Return(newMockResponse(ctrl, http.StatusOK, []byte("content")), nil).AnyTimes() | |
| 53 | 54 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | |
| 54 | 55 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | |
| @@ -61,7 +62,7 @@ func createTestService(ctrl *gomock.Controller) *InstallationService { | |||
| 61 | 62 | partitionHandler := handlers.NewPartitionHandler(mockExec, mockLogger) | |
| 62 | 63 | baseHandler := handlers.NewInstallBaseHandler(mockFS, mockExec, mockChrExec, mockLogger) | |
| 63 | 64 | configHandler := handlers.NewConfigureSystemHandler(mockFS, mockChrExec, mockLogger) | |
| 64 | - | bootloaderHandler := handlers.NewBootloaderHandler(mockChrExec, mockLogger) | |
| 65 | + | bootloaderHandler := handlers.NewBootloaderHandler(mockFS, mockExec, mockChrExec, mockLogger) | |
| 65 | 66 | reposHandler := handlers.NewReposHandler(mockFS, mockChrExec, mockLogger) | |
| 66 | 67 | postInstallHandler := handlers.NewPostInstallHandler(mockFS, mockHTTP, mockChrExec, mockScriptExec, mockLogger, "https://raw.githubusercontent.com/bnema/archup/dev") | |
| 67 | 68 | ||
| @@ -134,6 +135,7 @@ func TestInstallationService_Start_InvalidHostname(t *testing.T) { | |||
| 134 | 135 | mockFS.EXPECT().WriteFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | |
| 135 | 136 | mockFS.EXPECT().MkdirAll(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | |
| 136 | 137 | mockFS.EXPECT().Chmod(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | |
| 138 | + | mockFS.EXPECT().Stat(gomock.Any()).Return(nil, nil).AnyTimes() | |
| 137 | 139 | mockHTTP.EXPECT().Get(gomock.Any()).Return(newMockResponse(ctrl, http.StatusOK, []byte("content")), nil).AnyTimes() | |
| 138 | 140 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | |
| 139 | 141 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | |
| @@ -146,7 +148,7 @@ func TestInstallationService_Start_InvalidHostname(t *testing.T) { | |||
| 146 | 148 | partitionHandler := handlers.NewPartitionHandler(mockExec, mockLogger) | |
| 147 | 149 | baseHandler := handlers.NewInstallBaseHandler(mockFS, mockExec, mockChrExec, mockLogger) | |
| 148 | 150 | configHandler := handlers.NewConfigureSystemHandler(mockFS, mockChrExec, mockLogger) | |
| 149 | - | bootloaderHandler := handlers.NewBootloaderHandler(mockChrExec, mockLogger) | |
| 151 | + | bootloaderHandler := handlers.NewBootloaderHandler(mockFS, mockExec, mockChrExec, mockLogger) | |
| 150 | 152 | reposHandler := handlers.NewReposHandler(mockFS, mockChrExec, mockLogger) | |
| 151 | 153 | postInstallHandler := handlers.NewPostInstallHandler(mockFS, mockHTTP, mockChrExec, mockScriptExec, mockLogger, "https://raw.githubusercontent.com/bnema/archup/dev") | |
| 152 | 154 | ||
| @@ -49,6 +49,7 @@ func createTestService(ctrl *gomock.Controller) *InstallationService { | |||||
| 49 | mockFS.EXPECT().WriteFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | 49 | mockFS.EXPECT().WriteFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | ||
| 50 | mockFS.EXPECT().MkdirAll(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | 50 | mockFS.EXPECT().MkdirAll(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | ||
| 51 | mockFS.EXPECT().Chmod(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | 51 | mockFS.EXPECT().Chmod(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | ||
| 52 | + | mockFS.EXPECT().Stat(gomock.Any()).Return(nil, nil).AnyTimes() | |||
| 52 | mockHTTP.EXPECT().Get(gomock.Any()).Return(newMockResponse(ctrl, http.StatusOK, []byte("content")), nil).AnyTimes() | 53 | mockHTTP.EXPECT().Get(gomock.Any()).Return(newMockResponse(ctrl, http.StatusOK, []byte("content")), nil).AnyTimes() | ||
| 53 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | 54 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | ||
| 54 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | 55 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | ||
| @@ -61,7 +62,7 @@ func createTestService(ctrl *gomock.Controller) *InstallationService { | |||||
| 61 | partitionHandler := handlers.NewPartitionHandler(mockExec, mockLogger) | 62 | partitionHandler := handlers.NewPartitionHandler(mockExec, mockLogger) | ||
| 62 | baseHandler := handlers.NewInstallBaseHandler(mockFS, mockExec, mockChrExec, mockLogger) | 63 | baseHandler := handlers.NewInstallBaseHandler(mockFS, mockExec, mockChrExec, mockLogger) | ||
| 63 | configHandler := handlers.NewConfigureSystemHandler(mockFS, mockChrExec, mockLogger) | 64 | configHandler := handlers.NewConfigureSystemHandler(mockFS, mockChrExec, mockLogger) | ||
| 64 | - | bootloaderHandler := handlers.NewBootloaderHandler(mockChrExec, mockLogger) | 65 | + | bootloaderHandler := handlers.NewBootloaderHandler(mockFS, mockExec, mockChrExec, mockLogger) |
| 65 | reposHandler := handlers.NewReposHandler(mockFS, mockChrExec, mockLogger) | 66 | reposHandler := handlers.NewReposHandler(mockFS, mockChrExec, mockLogger) | ||
| 66 | postInstallHandler := handlers.NewPostInstallHandler(mockFS, mockHTTP, mockChrExec, mockScriptExec, mockLogger, "https://raw.githubusercontent.com/bnema/archup/dev") | 67 | postInstallHandler := handlers.NewPostInstallHandler(mockFS, mockHTTP, mockChrExec, mockScriptExec, mockLogger, "https://raw.githubusercontent.com/bnema/archup/dev") | ||
| 67 | 68 | ||||
| @@ -134,6 +135,7 @@ func TestInstallationService_Start_InvalidHostname(t *testing.T) { | |||||
| 134 | mockFS.EXPECT().WriteFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | 135 | mockFS.EXPECT().WriteFile(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | ||
| 135 | mockFS.EXPECT().MkdirAll(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | 136 | mockFS.EXPECT().MkdirAll(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | ||
| 136 | mockFS.EXPECT().Chmod(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | 137 | mockFS.EXPECT().Chmod(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() | ||
| 138 | + | mockFS.EXPECT().Stat(gomock.Any()).Return(nil, nil).AnyTimes() | |||
| 137 | mockHTTP.EXPECT().Get(gomock.Any()).Return(newMockResponse(ctrl, http.StatusOK, []byte("content")), nil).AnyTimes() | 139 | mockHTTP.EXPECT().Get(gomock.Any()).Return(newMockResponse(ctrl, http.StatusOK, []byte("content")), nil).AnyTimes() | ||
| 138 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | 140 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | ||
| 139 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | 141 | mockChrExec.EXPECT().ExecuteInChroot(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return([]byte{}, nil).AnyTimes() | ||
| @@ -146,7 +148,7 @@ func TestInstallationService_Start_InvalidHostname(t *testing.T) { | |||||
| 146 | partitionHandler := handlers.NewPartitionHandler(mockExec, mockLogger) | 148 | partitionHandler := handlers.NewPartitionHandler(mockExec, mockLogger) | ||
| 147 | baseHandler := handlers.NewInstallBaseHandler(mockFS, mockExec, mockChrExec, mockLogger) | 149 | baseHandler := handlers.NewInstallBaseHandler(mockFS, mockExec, mockChrExec, mockLogger) | ||
| 148 | configHandler := handlers.NewConfigureSystemHandler(mockFS, mockChrExec, mockLogger) | 150 | configHandler := handlers.NewConfigureSystemHandler(mockFS, mockChrExec, mockLogger) | ||
| 149 | - | bootloaderHandler := handlers.NewBootloaderHandler(mockChrExec, mockLogger) | 151 | + | bootloaderHandler := handlers.NewBootloaderHandler(mockFS, mockExec, mockChrExec, mockLogger) |
| 150 | reposHandler := handlers.NewReposHandler(mockFS, mockChrExec, mockLogger) | 152 | reposHandler := handlers.NewReposHandler(mockFS, mockChrExec, mockLogger) | ||
| 151 | postInstallHandler := handlers.NewPostInstallHandler(mockFS, mockHTTP, mockChrExec, mockScriptExec, mockLogger, "https://raw.githubusercontent.com/bnema/archup/dev") | 153 | postInstallHandler := handlers.NewPostInstallHandler(mockFS, mockHTTP, mockChrExec, mockScriptExec, mockLogger, "https://raw.githubusercontent.com/bnema/archup/dev") | ||
| 152 | 154 | ||||