Skip to content

Commit a79d0e2

Browse files
committed
Fix unit tests
1 parent c78d19e commit a79d0e2

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

juju/model.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,12 +1655,8 @@ async def debug_log(
16551655

16561656
def _get_series(self, entity_url, entity):
16571657
# try to get the series from the provided charm URL
1658-
if entity_url.startswith('cs:'):
1659-
parts = entity_url[3:].split('/')
1660-
else:
1661-
parts = entity_url.split('/')
1662-
if parts[0].startswith('~'):
1663-
parts.pop(0)
1658+
parts = entity_url.split('/')
1659+
16641660
if len(parts) > 1:
16651661
# series was specified in the URL
16661662
return parts[0]

tests/unit/test_model.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ def test_get_series():
118118
},
119119
},
120120
}
121-
assert model._get_series('ch:trusty/ubuntu', entity) == 'trusty'
122121
assert model._get_series('xenial/ubuntu', entity) == 'xenial'
123-
assert model._get_series('~foo/xenial/ubuntu', entity) == 'xenial'
124-
assert model._get_series('~foo/ubuntu', entity) == 'xenial'
125122
assert model._get_series('ubuntu', entity) == 'xenial'
126123
assert model._get_series('ch:ubuntu', entity) == 'xenial'
127124

0 commit comments

Comments
 (0)