Merge lp://staging/~achiang/ubuntu-test-cases/savilerow into lp://staging/ubuntu-test-cases
Proposed by
Alex Chiang
Status: | Merged |
---|---|
Merge reported by: | Andy Doan |
Merged at revision: | not available |
Proposed branch: | lp://staging/~achiang/ubuntu-test-cases/savilerow |
Merge into: | lp://staging/ubuntu-test-cases |
Diff against target: |
6972 lines (+5984/-0) (has conflicts) 185 files modified
README-cli.rst (+76/-0) jenkins/production.py (+77/-0) jenkins/setup_jenkins.py (+213/-0) jenkins/staging.py (+26/-0) jenkins/templates/touch-autopilot-base.xml.jinja2 (+31/-0) jenkins/templates/touch-base.xml.jinja2 (+79/-0) jenkins/templates/touch-click_image_tests.xml.jinja2 (+8/-0) jenkins/templates/touch-customizations.xml.jinja2 (+6/-0) jenkins/templates/touch-default.xml.jinja2 (+9/-0) jenkins/templates/touch-eventstat.xml.jinja2 (+20/-0) jenkins/templates/touch-install-and-boot.xml.jinja2 (+29/-0) jenkins/templates/touch-master-free.xml.jinja2 (+20/-0) jenkins/templates/touch-master.xml.jinja2 (+84/-0) jenkins/templates/touch-memevent.xml.jinja2 (+10/-0) jenkins/templates/touch-sdk.xml.jinja2 (+9/-0) jenkins/templates/touch-security.xml.jinja2 (+9/-0) jenkins/templates/touch-setup.xml.jinja2 (+18/-0) jenkins/templates/touch-smem.xml.jinja2 (+22/-0) jenkins/templates/touch-smoke.xml.jinja2 (+147/-0) jenkins/templates/touch-upgrade.xml.jinja2 (+28/-0) jenkins/testconfig.py (+171/-0) scripts/assert-image (+25/-0) scripts/combine_results (+94/-0) scripts/device (+191/-0) scripts/get-adb-id (+39/-0) scripts/jenkins.sh (+186/-0) scripts/provision.sh (+126/-0) scripts/reboot-and-wait (+41/-0) scripts/run-autopilot-tests.sh (+185/-0) scripts/run-smoke (+221/-0) scripts/run-touch-upgrade.sh (+46/-0) scripts/statsd.py (+35/-0) selftests/test_reboot_and_wait.py (+66/-0) selftests/test_run_smoke.py (+141/-0) selftests/test_statsd.py (+64/-0) tests/address-book-app-autopilot/master.run (+15/-0) tests/address-book-app-autopilot/ts_control (+1/-0) tests/address-book-app-autopilot/tslist.auto (+4/-0) tests/calendar-app-autopilot/master.run (+15/-0) tests/calendar-app-autopilot/ts_control (+1/-0) tests/calendar-app-autopilot/tslist.auto (+4/-0) tests/camera-app-autopilot/master.run (+15/-0) tests/camera-app-autopilot/ts_control (+1/-0) tests/camera-app-autopilot/tslist.auto (+4/-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/dialer-app-autopilot/master.run (+15/-0) tests/dialer-app-autopilot/ts_control (+1/-0) tests/dialer-app-autopilot/tslist.auto (+4/-0) tests/dropping-letters-app-autopilot/master.run (+15/-0) tests/dropping-letters-app-autopilot/ts_control (+1/-0) tests/dropping-letters-app-autopilot/tslist.auto (+4/-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/friends-app-autopilot/master.run (+15/-0) tests/friends-app-autopilot/ts_control (+1/-0) tests/friends-app-autopilot/tslist.auto (+4/-0) tests/gallery-app-autopilot/master.run (+15/-0) tests/gallery-app-autopilot/ts_control (+1/-0) tests/gallery-app-autopilot/tslist.auto (+4/-0) tests/install-and-boot/boot/tc_control (+9/-0) tests/install-and-boot/master.run (+5/-0) tests/install-and-boot/tslist.run (+1/-0) tests/mediaplayer-app-autopilot/master.run (+15/-0) tests/mediaplayer-app-autopilot/ts_control (+1/-0) tests/mediaplayer-app-autopilot/tslist.auto (+4/-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 (+80/-0) tests/messaging-app-autopilot/master.run (+15/-0) tests/messaging-app-autopilot/ts_control (+1/-0) tests/messaging-app-autopilot/tslist.auto (+4/-0) tests/music-app-autopilot/master.run (+15/-0) tests/music-app-autopilot/ts_control (+1/-0) tests/music-app-autopilot/tslist.auto (+4/-0) tests/notes-app-autopilot/master.run (+15/-0) tests/notes-app-autopilot/ts_control (+1/-0) tests/notes-app-autopilot/tslist.auto (+4/-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) tests/ubuntu-calculator-app-autopilot/master.run (+15/-0) tests/ubuntu-calculator-app-autopilot/ts_control (+1/-0) tests/ubuntu-calculator-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-clock-app-autopilot/master.run (+15/-0) tests/ubuntu-clock-app-autopilot/ts_control (+1/-0) tests/ubuntu-clock-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-docviewer-app-autopilot/master.run (+15/-0) tests/ubuntu-docviewer-app-autopilot/ts_control (+1/-0) tests/ubuntu-docviewer-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-filemanager-app-autopilot/master.run (+15/-0) tests/ubuntu-filemanager-app-autopilot/ts_control (+1/-0) tests/ubuntu-filemanager-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-rssreader-app-autopilot/master.run (+15/-0) tests/ubuntu-rssreader-app-autopilot/ts_control (+1/-0) tests/ubuntu-rssreader-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-system-settings-online-accounts-autopilot/master.run (+15/-0) tests/ubuntu-system-settings-online-accounts-autopilot/ts_control (+1/-0) tests/ubuntu-system-settings-online-accounts-autopilot/tslist.auto (+4/-0) tests/ubuntu-terminal-app-autopilot/master.run (+15/-0) tests/ubuntu-terminal-app-autopilot/ts_control (+1/-0) tests/ubuntu-terminal-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-ui-toolkit-autopilot/master.run (+15/-0) tests/ubuntu-ui-toolkit-autopilot/ts_control (+1/-0) tests/ubuntu-ui-toolkit-autopilot/tslist.auto (+4/-0) tests/ubuntu-weather-app-autopilot/master.run (+15/-0) tests/ubuntu-weather-app-autopilot/ts_control (+1/-0) tests/ubuntu-weather-app-autopilot/tslist.auto (+4/-0) tests/unity8-autopilot/master.run (+15/-0) tests/unity8-autopilot/setup.sh (+6/-0) tests/unity8-autopilot/ts_control (+2/-0) tests/unity8-autopilot/tslist.auto (+4/-0) tests/upgrade/README (+3/-0) tests/upgrade/install_old/run.sh (+27/-0) tests/upgrade/install_old/tc_control (+9/-0) tests/upgrade/master.run (+5/-0) tests/upgrade/tslist.run (+2/-0) tests/upgrade/upgrade/tc_control (+9/-0) tests/upgrade/upgrade/upgrade.sh (+79/-0) tests/webbrowser-app-autopilot/master.run (+15/-0) tests/webbrowser-app-autopilot/ts_control (+1/-0) tests/webbrowser-app-autopilot/tslist.auto (+4/-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/~achiang/ubuntu-test-cases/savilerow |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Test Case Developers | Pending | ||
Review via email: mp+201849@code.staging.launchpad.net |
Description of the change
We have fixed a long-standing typo in the savilerow project (was sevilerow).
Pull tests from the proper source branch.
To post a comment you must log in.