Merge lp://staging/~pwlars/ubuntu-test-cases/touch-rmrf into lp://staging/ubuntu-test-cases
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~pwlars/ubuntu-test-cases/touch-rmrf |
Merge into: | lp://staging/ubuntu-test-cases |
Diff against target: |
6374 lines (+5848/-0) (has conflicts) 98 files modified
README-cli.rst (+80/-0) jenkins/production.py (+95/-0) jenkins/setup_jenkins.py (+213/-0) jenkins/staging.py (+22/-0) jenkins/templates/touch-base.xml.jinja2 (+93/-0) jenkins/templates/touch-master.xml.jinja2 (+121/-0) jenkins/templates/touch-smoke.xml.jinja2 (+163/-0) jenkins/testconfig.py (+176/-0) scripts/assert-image (+28/-0) scripts/combine_results (+94/-0) scripts/dashboard.py (+295/-0) scripts/device (+191/-0) scripts/get-adb-id (+39/-0) scripts/jenkins.sh (+186/-0) scripts/junit2utah.py (+70/-0) scripts/provision.sh (+131/-0) scripts/reboot-and-wait (+41/-0) scripts/run-autopilot-tests.sh (+215/-0) scripts/run-smoke (+357/-0) scripts/run-touch-upgrade.sh (+46/-0) scripts/statsd.py (+35/-0) selftests/test_junit2utah.py (+49/-0) selftests/test_reboot_and_wait.py (+66/-0) selftests/test_run_smoke.py (+143/-0) selftests/test_statsd.py (+64/-0) tests/click_image_tests/check_preinstalled_list/check_preinstalled_list.py (+61/-0) tests/click_image_tests/check_preinstalled_list/tc_control (+10/-0) tests/click_image_tests/master.run (+5/-0) tests/click_image_tests/tslist.run (+1/-0) tests/customizations/master.run (+5/-0) tests/customizations/setup.sh (+10/-0) tests/customizations/ts_control (+1/-0) tests/customizations/tslist.auto (+4/-0) tests/default/ifconfig/tc_control (+13/-0) tests/default/install/tc_control (+12/-0) tests/default/master.run (+5/-0) tests/default/netstat/tc_control (+12/-0) tests/default/ping/pingtest.sh (+12/-0) tests/default/ping/tc_control (+12/-0) tests/default/pwd/tc_control (+9/-0) tests/default/pwd/test.sh (+18/-0) tests/default/route/tc_control (+12/-0) tests/default/systemsettle/systemsettle.sh (+120/-0) tests/default/systemsettle/tc_control (+9/-0) tests/default/ts_control (+3/-0) tests/default/tslist.run (+10/-0) tests/default/uname/tc_control (+12/-0) tests/default/unity8/tc_control (+9/-0) tests/default/vmstat/tc_control (+12/-0) tests/eventstat/eventstat/eventstat.sh (+5/-0) tests/eventstat/eventstat/setup.sh (+7/-0) tests/eventstat/eventstat/tc_control (+12/-0) tests/eventstat/master.run (+5/-0) tests/eventstat/tslist.run (+1/-0) tests/memevent/master.run (+5/-0) tests/memevent/setup.sh (+8/-0) tests/memevent/ts_control (+1/-0) tests/memevent/tslist.auto (+7/-0) tests/memevent/ubuntu_test_cases/__init__.py (+6/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/__init__.py (+1/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/__init__.py (+21/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/browser.py (+103/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/camera.py (+58/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/gallery.py (+41/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/media_player.py (+53/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/matchers.py (+37/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/probes.py (+170/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/smem-tabs (+687/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/__init__.py (+1/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/test_memory_usage.py (+79/-0) tests/sdk/master.run (+5/-0) tests/sdk/run_test.sh (+20/-0) tests/sdk/setup.sh (+12/-0) tests/sdk/ts_control (+1/-0) tests/sdk/tslist.auto (+3/-0) tests/security/master.run (+5/-0) tests/security/run_test.sh (+25/-0) tests/security/setup.sh (+12/-0) tests/security/ts_control (+1/-0) tests/security/tslist.auto (+6/-0) tests/smem/master.run (+15/-0) tests/smem/smem/smem-tabs (+687/-0) tests/smem/smem/smem.sh (+12/-0) tests/smem/smem/tc_control (+11/-0) tests/smem/tslist.run (+1/-0) tests/systemsettle/systemsettle-after/tc_control (+9/-0) tests/systemsettle/systemsettle-before/tc_control (+9/-0) tests/systemsettle/systemsettle.sh (+119/-0) tests/systemsettle/tslist.run (+2/-0) utils/host/adb-shell (+23/-0) utils/host/autopilot-list (+18/-0) utils/host/autopilot-run (+7/-0) utils/host/prepare-autopilot-test.sh (+5/-0) utils/target/autopilot-list (+13/-0) utils/target/autopilot-run (+6/-0) utils/target/prepare-autopilot-test.sh (+17/-0) utils/target/unlock_screen.py (+98/-0) utils/target/unlock_screen.sh (+8/-0) Conflict adding file scripts. Moved existing file to scripts.moved. |
To merge this branch: | bzr merge lp://staging/~pwlars/ubuntu-test-cases/touch-rmrf |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Test Case Developers | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2014-02-13.
Commit message
Really remove the clientlogs/{{test}} directory (Fixes LP:1279744)
Description of the change
Fix for LP:1279744
Unmerged revisions
- 186. By Paul Larson
-
Really remove the clientlogs/{{test}} dir
- 185. By Javier Collado
-
Fixed slider retrieval
- 184. By Andy Doan
-
provide an early exit for NETWORK_FILE as well as some documentation
- 183. By Andy Doan
-
assert-image failing due to typo
This gets assert-image working when the UUID's don't match
- 182. By Andy Doan
-
fix dashboard issue with install-and-boot
our utah yaml for this was missing some required fields
- 181. By Andy Doan
-
update testconfig.py to work with touch_custom and touch_sf4p
somewhere along the line this got broke. this fixes things.
- 180. By Andy Doan
-
don't leak the api-key to the public
- 179. By Andy Doan
-
run-autopilot-
tests.sh requires DASHBOARD_PORT to be set i meant for this to be optional, but its quicker just to set it
here for now - 178. By Andy Doan
-
fix a jenkins stack-trace
- 177. By Andy Doan
-
master jobs need to be restricted to run from "master" and not just pick a random slave