Merge lp://qastaging/~free.ekanayaka/landscape-charm/faster-hashids-test into lp://qastaging/~landscape/landscape-charm/trunk

Proposed by Free Ekanayaka
Status: Merged
Approved by: Free Ekanayaka
Approved revision: 293
Merged at revision: 294
Proposed branch: lp://qastaging/~free.ekanayaka/landscape-charm/faster-hashids-test
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 185 lines (+71/-10)
6 files modified
Makefile (+1/-1)
lib/apt.py (+12/-1)
lib/paths.py (+1/-0)
lib/tests/rootdir.py (+1/-1)
lib/tests/test_apt.py (+56/-1)
tests/basic/test_service.py (+0/-6)
To merge this branch: bzr merge lp://qastaging/~free.ekanayaka/landscape-charm/faster-hashids-test
Reviewer Review Type Date Requested Status
Chad Smith Approve
Adam Collard (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+260474@code.qastaging.launchpad.net

Commit message

Use the sample hash-id-databases configuration in order to make the test_hash_id_databases_cron test run faster.

Description of the change

Use the sample hash-id-databases configuration in order to make the test_hash_id_databases_cron test run faster.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 291
Branch: lp:~free.ekanayaka/landscape-charm/faster-hashids-test
Jenkins: https://ci.lscape.net/job/latch-test/1072/

review: Approve (test results)
Revision history for this message
Chad Smith (chad.smith) wrote :

Marking Needs Fixing to see how you intend to resolve the current error.

review: Needs Fixing
Revision history for this message
Free Ekanayaka (free.ekanayaka) :
292. By Free Ekanayaka

Address review comments

293. By Free Ekanayaka

Merge from trunk, fix conflicts

Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 293
Branch: lp:~free.ekanayaka/landscape-charm/faster-hashids-test
Jenkins: https://ci.lscape.net/job/latch-test/1114/

review: Approve (test results)
Revision history for this message
Adam Collard (adam-collard) wrote :

+1.

Sorry this took so long, I fell in the usual traps for integration tests on charms.

1) don't run make integration-test; run make integration-test-trunk
2) don't use a MAAS provider that you're not pointing DNS at

review: Approve
Revision history for this message
Free Ekanayaka (free.ekanayaka) wrote :

> +1.
>
> Sorry this took so long, I fell in the usual traps for integration tests on
> charms.
>
> 1) don't run make integration-test; run make integration-test-trunk
> 2) don't use a MAAS provider that you're not pointing DNS at

Errata corrige:

2) don't use a MAAS provider, use a local provider

Revision history for this message
Chad Smith (chad.smith) wrote :

Yes my failing was regarding running make integration-test (which fails with 100% of the time with this branch) and not make integration-test-trunk.

I'm not sure we need backwards compatibility for make integration-test in landscape-charm/trunk with landscape-charm/stable as this charm branch will eventually be stable when we are trying to run make integration-test in jenkins.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches