@@ -341,28 +341,31 @@ def test_image_create_dead_options(self):
341341
342342class TestAddProjectToImage (TestImage ):
343343
344+ _image = image_fakes .FakeImage .create_one_image ()
345+
344346 columns = (
345347 'image_id' ,
346348 'member_id' ,
347349 'status' ,
348350 )
351+
349352 datalist = (
350- image_fakes . image_id ,
353+ _image . id ,
351354 identity_fakes .project_id ,
352- image_fakes .member_status ,
355+ image_fakes .member_status
353356 )
354357
355358 def setUp (self ):
356359 super (TestAddProjectToImage , self ).setUp ()
357360
358361 # This is the return value for utils.find_resource()
359- self .images_mock .get .return_value = fakes . FakeResource (
360- None ,
361- copy . deepcopy ( image_fakes . IMAGE ),
362- loaded = True ,
363- )
362+ self .images_mock .get .return_value = self . _image
363+
364+ # Update the image_id in the MEMBER dict
365+ self . new_member = copy . deepcopy ( image_fakes . MEMBER )
366+ self . new_member [ 'image_id' ] = self . _image . id
364367 self .image_members_mock .create .return_value = fakes .FakeModel (
365- copy . deepcopy ( image_fakes . MEMBER ) ,
368+ self . new_member ,
366369 )
367370 self .project_mock .get .return_value = fakes .FakeResource (
368371 None ,
@@ -379,11 +382,11 @@ def setUp(self):
379382
380383 def test_add_project_to_image_no_option (self ):
381384 arglist = [
382- image_fakes . image_id ,
385+ self . _image . id ,
383386 identity_fakes .project_id ,
384387 ]
385388 verifylist = [
386- ('image' , image_fakes . image_id ),
389+ ('image' , self . _image . id ),
387390 ('project' , identity_fakes .project_id ),
388391 ]
389392 parsed_args = self .check_parser (self .cmd , arglist , verifylist )
@@ -393,20 +396,21 @@ def test_add_project_to_image_no_option(self):
393396 # data to be shown.
394397 columns , data = self .cmd .take_action (parsed_args )
395398 self .image_members_mock .create .assert_called_with (
396- image_fakes . image_id ,
399+ self . _image . id ,
397400 identity_fakes .project_id
398401 )
402+
399403 self .assertEqual (self .columns , columns )
400404 self .assertEqual (self .datalist , data )
401405
402406 def test_add_project_to_image_with_option (self ):
403407 arglist = [
404- image_fakes . image_id ,
408+ self . _image . id ,
405409 identity_fakes .project_id ,
406410 '--project-domain' , identity_fakes .domain_id ,
407411 ]
408412 verifylist = [
409- ('image' , image_fakes . image_id ),
413+ ('image' , self . _image . id ),
410414 ('project' , identity_fakes .project_id ),
411415 ('project_domain' , identity_fakes .domain_id ),
412416 ]
@@ -417,7 +421,7 @@ def test_add_project_to_image_with_option(self):
417421 # data to be shown.
418422 columns , data = self .cmd .take_action (parsed_args )
419423 self .image_members_mock .create .assert_called_with (
420- image_fakes . image_id ,
424+ self . _image . id ,
421425 identity_fakes .project_id
422426 )
423427 self .assertEqual (self .columns , columns )
0 commit comments