VladPolskiy/ubuntu-desktop-provision
1
0
Fork 0
mirror of https://github.com/canonical/ubuntu-desktop-provision.git synced 2025-07-25 16:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: backport 'reset storage before setting a guided target' to 24.04 (#1127)

Browse Source 
Backport of #986
This commit is contained in:
Dennis Loose
2025-07-18 14:58:29 +02:00
committed by GitHub
parent 4b7acdd0ac 6fe93d321f
commit e7a80f89b8
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/ubuntu_bootstrap/lib/services/storage_service.dart
View File

@ -87,6 +87,7 @@ class StorageService {
/// Sets the selected target for guided partitioning. /// Sets the selected target for guided partitioning.
Future<void> setGuidedStorage() async { Future<void> setGuidedStorage() async {
await _client.resetStorageV2();
await _client.setGuidedStorageV2( await _client.setGuidedStorageV2(
GuidedChoiceV2( GuidedChoiceV2(
target: guidedTarget!, target: guidedTarget!,

4
packages/ubuntu_bootstrap/test/services/storage_service_test.dart
View File

@ -34,6 +34,8 @@ void main() {
state: ApplicationState.RUNNING, state: ApplicationState.RUNNING,
), ),
); );
when(client.resetStorageV2())
.thenAnswer((_) async => fakeStorageResponse());
}); });
test('get guided storage', () async { test('get guided storage', () async {
@ -62,6 +64,7 @@ void main() {
final service = StorageService(client); final service = StorageService(client);
service.guidedTarget = target; service.guidedTarget = target;
await service.setGuidedStorage(); await service.setGuidedStorage();
verify(client.resetStorageV2()).called(1);
verify(client.setGuidedStorageV2(choice)).called(1); verify(client.setGuidedStorageV2(choice)).called(1);
verify(client.setStorageV2()).called(1); verify(client.setStorageV2()).called(1);
}); });
@ -85,6 +88,7 @@ void main() {
service.guidedTarget = target; service.guidedTarget = target;
await service.setGuidedStorage(); await service.setGuidedStorage();
verify(client.resetStorageV2()).called(1);
verify(client.setGuidedStorageV2(choice)).called(1); verify(client.setGuidedStorageV2(choice)).called(1);
verify(client.setStorageV2()).called(1); verify(client.setStorageV2()).called(1);
}); });