Skip to content

Commit

Permalink
ci: don't merge, testing juju 3.6 only
Browse files Browse the repository at this point in the history
  • Loading branch information
dimaqq committed Oct 18, 2024
1 parent 35ee88e commit 843c5d8
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ jobs:
timeout-minutes: 150
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python:
# We will reduce the workload to 3.10 to
Expand All @@ -113,8 +114,7 @@ jobs:
# * test_destroy_unit
# * test_ssh
# * ...
# - "3.6/beta"
continue-on-error: false # ultimately fail a run if one of the matrix combinations fails
- "3.6/beta"
steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down Expand Up @@ -166,6 +166,7 @@ jobs:
timeout-minutes: 150
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python:
- "3.10"
Expand All @@ -174,10 +175,9 @@ jobs:
- "3.3/stable"
- "3.4/stable"
- "3.5/stable"
continue-on-error: false # ultimately fail the run if one of the matrix combinations fails
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
Expand Down
1 change: 1 addition & 0 deletions juju/client/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ async def rpc(self, msg, encoder=None):
raise
result = await self._recv(msg['request-id'])
log.debug('connection id : {} <--- {}'.format(id(self), result))
log.warning("DUMP\n%s\n%s", outgoing, result)

if not result:
return result
Expand Down
22 changes: 22 additions & 0 deletions tests/integration/test_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,32 @@ async def test_add_units():
assert isinstance(unit, Unit)


@pytest.mark.parametrize("thebase", [
None,
"[email protected]",
"[email protected]/stable",
"[email protected]",
"[email protected]/stable",
"[email protected]",
"[email protected]/stable",
"[email protected]",
"[email protected]/stable",
])
@base.bootstrapped
async def test_deploy_charmhub_charm_ex(thebase: str):
async with base.CleanModel() as model:
app = await model.deploy('ubuntu', base=thebase)
assert False, "fail on purpose to get the logs"
await model.block_until(lambda: (len(app.units) > 0 and
app.units[0].machine))
assert 'ubuntu' in app.data['charm-url']


@base.bootstrapped
async def test_deploy_charmhub_charm():
async with base.CleanModel() as model:
app = await model.deploy('ubuntu')
assert False, "fail on purpose to get the logs"
await model.block_until(lambda: (len(app.units) > 0 and
app.units[0].machine))
assert 'ubuntu' in app.data['charm-url']
Expand Down

0 comments on commit 843c5d8

Please sign in to comment.