summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
36e23b3)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
"image %r already includes a tag, cannot add tag argument %r",
args.image, args.tag)
sys.exit(1)
"image %r already includes a tag, cannot add tag argument %r",
args.image, args.tag)
sys.exit(1)
- args.image, args.tag = args.image.split(':', 1)
+ # rsplit() accommodates "myrepo.example:8888/repo/image:tag"
+ args.image, args.tag = args.image.rsplit(':', 1)
elif args.tag is None:
args.tag = 'latest'
elif args.tag is None:
args.tag = 'latest'
side_effect=StopTest) as find_image_mock:
self.run_arv_keepdocker(['repo:tag'], sys.stderr)
find_image_mock.assert_called_with('repo', 'tag')
side_effect=StopTest) as find_image_mock:
self.run_arv_keepdocker(['repo:tag'], sys.stderr)
find_image_mock.assert_called_with('repo', 'tag')
+
+ with self.assertRaises(StopTest), \
+ mock.patch('arvados.commands.keepdocker.find_one_image_hash',
+ side_effect=StopTest) as find_image_mock:
+ self.run_arv_keepdocker(['myreg.example:8888/repo/img:tag'], sys.stderr)
+ find_image_mock.assert_called_with('myreg.example:8888/repo/img', 'tag')