Skip to content

Commit 06f4312

Browse files
committed
Make argument optional to save unit tests
1 parent 871de22 commit 06f4312

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

juju/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ def base_channel_to_series(channel):
421421
return get_version_series(origin.Channel.parse(channel).track)
422422

423423

424+
<<<<<<< HEAD
424425
def parse_base_arg(base):
425426
"""Parses a given base into a Client.Base object
426427
:param base str : The base to deploy a charm (e.g. ubuntu@22.04)
@@ -532,7 +533,7 @@ def series_selector(series_arg='', charm_url=None, model_config=None, supported_
532533
return DEFAULT_SUPPORTED_LTS
533534

534535

535-
def should_upgrade_resource(available_resource, existing_resources, arg_resources):
536+
def should_upgrade_resource(available_resource, existing_resources, arg_resources={}):
536537
"""Called in the context of upgrade_charm. Given a resource R, takes a look at the resources we
537538
already have and decides if we need to refresh R.
538539

0 commit comments

Comments
 (0)