Merge lp://qastaging/~nuclearbob/ubuntu-test-cases/memevent-update-nfss into lp://qastaging/ubuntu-test-cases/touch
Proposed by
Max Brustkern
| Status: | Merged |
|---|---|
| Merged at revision: | 324 |
| Proposed branch: | lp://qastaging/~nuclearbob/ubuntu-test-cases/memevent-update-nfss |
| Merge into: | lp://qastaging/ubuntu-test-cases/touch |
| Diff against target: |
702 lines (+349/-250) 11 files modified
jenkins/templates/touch-base.xml.jinja2 (+6/-1) tests/memevent/nfss_upload_results.py (+185/-0) tests/memevent/tslist.auto (+2/-2) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/browser.py (+0/-103) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/camera.py (+0/-58) tests/memevent/ubuntu_test_cases/memory_usage_measurement/probes.py (+21/-7) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/__init__.py (+69/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/test_browser.py (+30/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/test_camera.py (+20/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/test_gallery.py (+16/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/test_memory_usage.py (+0/-79) |
| To merge this branch: | bzr merge lp://qastaging/~nuclearbob/ubuntu-test-cases/memevent-update-nfss |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Larson | Approve | ||
|
Review via email:
|
|||
Description of the change
This merge adds nfss insertion to the memevent tests, and also makes them work again. Let me know what else needs to happen to make this work.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I haven't tested this, but it seems pretty self-contained to memevent so I'm happy to give it a shot.