@@ -46,15 +46,19 @@ def src_disk(request):
4646 disk = compute_v1 .Disk ()
4747 disk .source_image = get_active_debian ().self_link
4848 disk .name = "test-disk-" + uuid .uuid4 ().hex [:10 ]
49- op = disk_client .insert (project = PROJECT , zone = INSTANCE_ZONE , disk_resource = disk )
49+ op = disk_client .insert_unary (
50+ project = PROJECT , zone = INSTANCE_ZONE , disk_resource = disk
51+ )
5052
5153 wait_for_operation (op , PROJECT )
5254 try :
5355 disk = disk_client .get (project = PROJECT , zone = INSTANCE_ZONE , disk = disk .name )
5456 request .cls .disk = disk
5557 yield disk
5658 finally :
57- op = disk_client .delete (project = PROJECT , zone = INSTANCE_ZONE , disk = disk .name )
59+ op = disk_client .delete_unary (
60+ project = PROJECT , zone = INSTANCE_ZONE , disk = disk .name
61+ )
5862 wait_for_operation (op , PROJECT )
5963
6064
@@ -64,7 +68,7 @@ def snapshot(request, src_disk):
6468 snapshot = compute_v1 .Snapshot ()
6569 snapshot .name = "test-snap-" + uuid .uuid4 ().hex [:10 ]
6670 disk_client = compute_v1 .DisksClient ()
67- op = disk_client .create_snapshot (
71+ op = disk_client .create_snapshot_unary (
6872 project = PROJECT ,
6973 zone = INSTANCE_ZONE ,
7074 disk = src_disk .name ,
@@ -79,7 +83,7 @@ def snapshot(request, src_disk):
7983
8084 yield snapshot
8185 finally :
82- op = snapshot_client .delete (project = PROJECT , snapshot = snapshot .name )
86+ op = snapshot_client .delete_unary (project = PROJECT , snapshot = snapshot .name )
8387 wait_for_operation (op , PROJECT )
8488
8589
@@ -89,15 +93,15 @@ def image(request, src_disk):
8993 image = compute_v1 .Image ()
9094 image .source_disk = src_disk .self_link
9195 image .name = "test-image-" + uuid .uuid4 ().hex [:10 ]
92- op = image_client .insert (project = PROJECT , image_resource = image )
96+ op = image_client .insert_unary (project = PROJECT , image_resource = image )
9397
9498 wait_for_operation (op , PROJECT )
9599 try :
96100 image = image_client .get (project = PROJECT , image = image .name )
97101 request .cls .image = image
98102 yield image
99103 finally :
100- op = image_client .delete (project = PROJECT , image = image .name )
104+ op = image_client .delete_unary (project = PROJECT , image = image .name )
101105 wait_for_operation (op , PROJECT )
102106
103107
0 commit comments