@@ -363,6 +363,47 @@ def test_volume_create_image_name(self):
363363 self .assertEqual (self .datalist , data )
364364
365365
366+ class TestVolumeDelete (TestVolume ):
367+ def setUp (self ):
368+ super (TestVolumeDelete , self ).setUp ()
369+
370+ self .volumes_mock .delete .return_value = None
371+
372+ # Get the command object to mock
373+ self .cmd = volume .DeleteVolume (self .app , None )
374+
375+ def test_volume_delete_one_volume (self ):
376+ volumes = self .setup_volumes_mock (count = 1 )
377+
378+ arglist = [
379+ volumes [0 ].id
380+ ]
381+ verifylist = [
382+ ("volumes" , [volumes [0 ].id ])
383+ ]
384+
385+ parsed_args = self .check_parser (self .cmd , arglist , verifylist )
386+
387+ self .cmd .take_action (parsed_args )
388+ self .volumes_mock .delete .assert_called_with (volumes [0 ].id )
389+
390+ def test_volume_delete_multi_volumes (self ):
391+ volumes = self .setup_volumes_mock (count = 3 )
392+
393+ arglist = [v .id for v in volumes ]
394+ verifylist = [
395+ ('volumes' , arglist ),
396+ ]
397+
398+ parsed_args = self .check_parser (self .cmd , arglist , verifylist )
399+
400+ self .cmd .take_action (parsed_args )
401+
402+ calls = [call (v .id ) for v in volumes ]
403+
404+ self .volumes_mock .delete .assert_has_calls (calls )
405+
406+
366407class TestVolumeList (TestVolume ):
367408
368409 columns = [
@@ -696,44 +737,3 @@ def test_volume_show(self):
696737
697738 self .assertEqual (volume_fakes .VOLUME_columns , columns )
698739 self .assertEqual (volume_fakes .VOLUME_data , data )
699-
700-
701- class TestVolumeDelete (TestVolume ):
702- def setUp (self ):
703- super (TestVolumeDelete , self ).setUp ()
704-
705- self .volumes_mock .delete .return_value = None
706-
707- # Get the command object to mock
708- self .cmd = volume .DeleteVolume (self .app , None )
709-
710- def test_volume_delete_one_volume (self ):
711- volumes = self .setup_volumes_mock (count = 1 )
712-
713- arglist = [
714- volumes [0 ].id
715- ]
716- verifylist = [
717- ("volumes" , [volumes [0 ].id ])
718- ]
719-
720- parsed_args = self .check_parser (self .cmd , arglist , verifylist )
721-
722- self .cmd .take_action (parsed_args )
723- self .volumes_mock .delete .assert_called_with (volumes [0 ].id )
724-
725- def test_volume_delete_multi_volumes (self ):
726- volumes = self .setup_volumes_mock (count = 3 )
727-
728- arglist = [v .id for v in volumes ]
729- verifylist = [
730- ('volumes' , arglist ),
731- ]
732-
733- parsed_args = self .check_parser (self .cmd , arglist , verifylist )
734-
735- self .cmd .take_action (parsed_args )
736-
737- calls = [call (v .id ) for v in volumes ]
738-
739- self .volumes_mock .delete .assert_has_calls (calls )
0 commit comments