Merge lp://qastaging/~udienz/ubuntu/natty/checkbox/checkbox.fix.514401 into lp://qastaging/checkbox
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~udienz/ubuntu/natty/checkbox/checkbox.fix.514401 | ||||
| Merge into: | lp://qastaging/checkbox | ||||
| Diff against target: |
59248 lines (+57780/-0) (has conflicts) 266 files modified
.bzr-builddeb/default.conf (+2/-0) COPYING (+674/-0) README (+5/-0) apport/checkbox.py (+24/-0) apport/source_checkbox.py (+17/-0) backend (+46/-0) bin/checkbox-cli (+18/-0) bin/checkbox-gtk (+18/-0) bin/checkbox-urwid (+18/-0) checkbox/application.py (+133/-0) checkbox/arguments.py (+95/-0) checkbox/attribute.py (+41/-0) checkbox/component.py (+184/-0) checkbox/contrib/REThread.py (+139/-0) checkbox/contrib/bpickle.py (+167/-0) checkbox/contrib/glock.py (+316/-0) checkbox/contrib/persist.py (+542/-0) checkbox/job.py (+131/-0) checkbox/lib/bit.py (+42/-0) checkbox/lib/cache.py (+37/-0) checkbox/lib/config.py (+156/-0) checkbox/lib/conversion.py (+80/-0) checkbox/lib/decorator.py (+28/-0) checkbox/lib/dmi.py (+74/-0) checkbox/lib/environ.py (+113/-0) checkbox/lib/fifo.py (+80/-0) checkbox/lib/input.py (+585/-0) checkbox/lib/log.py (+68/-0) checkbox/lib/path.py (+66/-0) checkbox/lib/pci.py (+86/-0) checkbox/lib/process.py (+137/-0) checkbox/lib/redirect.py (+158/-0) checkbox/lib/resolver.py (+126/-0) checkbox/lib/safe.py (+96/-0) checkbox/lib/script.py (+33/-0) checkbox/lib/signal.py (+89/-0) checkbox/lib/template.py (+144/-0) checkbox/lib/template_i18n.py (+133/-0) checkbox/lib/tests/resolver.py (+100/-0) checkbox/lib/text.py (+100/-0) checkbox/lib/transport.py (+279/-0) checkbox/lib/update.py (+42/-0) checkbox/lib/url.py (+41/-0) checkbox/lib/usb.py (+57/-0) checkbox/message.py (+311/-0) checkbox/plugin.py (+50/-0) checkbox/properties.py (+204/-0) checkbox/reactor.py (+113/-0) checkbox/report.py (+150/-0) checkbox/reports/launchpad_report.py (+287/-0) checkbox/reports/xml_report.py (+191/-0) checkbox/resource.py (+121/-0) checkbox/tests/report.py (+109/-0) checkbox/user_interface.py (+216/-0) checkbox/variables.py (+288/-0) checkbox_cli/cli_interface.py (+355/-0) checkbox_gtk/gtk_interface.py (+521/-0) checkbox_gtk/hyper_text_view.py (+116/-0) checkbox_urwid/urwid_interface.py (+807/-0) data/documents/RTF_Russian.rtf (+51/-0) data/images/SVG_Color_Image_Xubuntu.svg (+109/-0) data/websites/SWF_Test.as (+14/-0) data/websites/flashtest.html (+6/-0) data/websites/flashvideo.html (+6/-0) data/websites/javatest.html (+9/-0) data/websites/testindex.html (+6/-0) debian/changelog (+447/-0) debian/checkbox-cli.install (+3/-0) debian/checkbox-cli.links (+1/-0) debian/checkbox-cli.postinst (+6/-0) debian/checkbox-gtk.install (+5/-0) debian/checkbox-gtk.links (+1/-0) debian/checkbox-gtk.postinst (+6/-0) debian/checkbox-urwid.install (+3/-0) debian/checkbox-urwid.links (+1/-0) debian/checkbox-urwid.postinst (+6/-0) debian/checkbox.config (+19/-0) debian/checkbox.dirs (+2/-0) debian/checkbox.install (+16/-0) debian/checkbox.links (+1/-0) debian/checkbox.manpages (+1/-0) debian/checkbox.postinst (+6/-0) debian/checkbox.postrm (+26/-0) debian/checkbox.templates (+40/-0) debian/compat (+1/-0) debian/control (+82/-0) debian/copyright (+33/-0) debian/hwtest-cli.postinst (+6/-0) debian/hwtest-gtk.postinst (+6/-0) debian/hwtest.postinst (+6/-0) debian/hwtest.postrm (+26/-0) debian/po/POTFILES.in (+1/-0) debian/po/templates.pot (+113/-0) debian/pycompat (+1/-0) debian/rules (+34/-0) debian/watch (+3/-0) examples/checkbox-cli.ini (+14/-0) examples/checkbox-gtk.ini (+16/-0) examples/checkbox-urwid.ini (+14/-0) examples/checkbox.ini (+26/-0) gtk/checkbox-gtk.desktop.in (+11/-0) gtk/checkbox-gtk.glade (+754/-0) icons/scalable/apps/checkbox.svg (+336/-0) install/config (+162/-0) install/postinst (+83/-0) jobs/audio.txt.in (+62/-0) jobs/autotest.txt.in (+6/-0) jobs/disk.txt.in (+21/-0) jobs/fingerprint.txt.in (+27/-0) jobs/firewire.txt.in (+10/-0) jobs/kms.txt.in (+13/-0) jobs/local.txt.in (+107/-0) jobs/ltp.txt.in (+12/-0) jobs/media.txt.in (+148/-0) jobs/monitor.txt.in (+21/-0) jobs/network.txt.in (+21/-0) jobs/peripheral.txt.in (+27/-0) jobs/phoronix.txt.in (+9/-0) jobs/qa_regression.txt.in (+7/-0) jobs/resource.txt.in (+40/-0) jobs/sleep.txt.in (+186/-0) jobs/user_apps.txt.in (+276/-0) jobs/video.txt.in (+123/-0) man/checkbox.1 (+106/-0) patches/0.1-ubuntu13 (+21/-0) patches/0.1-ubuntu14 (+40/-0) patches/0.1-ubuntu15 (+17/-0) patches/0.1-ubuntu2 (+10/-0) patches/0.1-ubuntu3 (+12/-0) patches/0.1-ubuntu4 (+7/-0) patches/0.1-ubuntu5 (+11/-0) patches/0.1-ubuntu6 (+5/-0) patches/0.1-ubuntu9 (+12/-0) patches/0.4 (+48/-0) patches/0.5 (+30/-0) patches/0.7.2 (+31/-0) patches/0.8 (+31/-0) patches/0.9 (+39/-0) plugins/apport_prompt.py (+267/-0) plugins/attachment_info.py (+39/-0) plugins/backend_info.py (+102/-0) plugins/begin_prompt.py (+33/-0) plugins/client_info.py (+43/-0) plugins/datetime_info.py (+36/-0) plugins/delay_prompt.py (+37/-0) plugins/error_prompt.py (+34/-0) plugins/final_prompt.py (+37/-0) plugins/gather_prompt.py (+39/-0) plugins/intro_prompt.py (+52/-0) plugins/jobs_info.py (+117/-0) plugins/jobs_prompt.py (+103/-0) plugins/launchpad_exchange.py (+173/-0) plugins/launchpad_prompt.py (+102/-0) plugins/launchpad_report.py (+149/-0) plugins/local_suite.py (+47/-0) plugins/lock_prompt.py (+64/-0) plugins/manual_test.py (+46/-0) plugins/message_info.py (+97/-0) plugins/metric_test.py (+41/-0) plugins/persist_info.py (+53/-0) plugins/proxy_info.py (+84/-0) plugins/recover_prompt.py (+56/-0) plugins/remote_suite.py (+48/-0) plugins/report_prompt.py (+38/-0) plugins/resource_info.py (+64/-0) plugins/scripts_info.py (+39/-0) plugins/shell_test.py (+62/-0) plugins/submission_info.py (+64/-0) plugins/subunit_report.py (+79/-0) plugins/suites_prompt.py (+115/-0) plugins/system_info.py (+81/-0) plugins/tests_prompt.py (+33/-0) plugins/user_interface.py (+76/-0) po/POTFILES.in (+42/-0) po/ar.po (+749/-0) po/ast.po (+731/-0) po/bg.po (+762/-0) po/ca.po (+747/-0) po/checkbox.pot (+1429/-0) po/cs.po (+749/-0) po/da.po (+706/-0) po/de.po (+846/-0) po/el.po (+749/-0) po/en_CA.po (+659/-0) po/en_GB.po (+744/-0) po/es.po (+827/-0) po/eu.po (+664/-0) po/fi.po (+791/-0) po/fr.po (+845/-0) po/he.po (+755/-0) po/hr.po (+681/-0) po/hu.po (+818/-0) po/id.po (+810/-0) po/is.po (+658/-0) po/it.po (+837/-0) po/ja.po (+724/-0) po/jbo.po (+650/-0) po/ka.po (+659/-0) po/ko.po (+658/-0) po/lt.po (+739/-0) po/lv.po (+653/-0) po/mk.po (+712/-0) po/nb.po (+737/-0) po/nds.po (+650/-0) po/nl.po (+674/-0) po/pl.po (+720/-0) po/pt.po (+650/-0) po/pt_BR.po (+773/-0) po/ro.po (+730/-0) po/ru.po (+767/-0) po/sk.po (+737/-0) po/sq.po (+650/-0) po/sv.po (+825/-0) po/th.po (+735/-0) po/tr.po (+700/-0) po/ug.po (+650/-0) po/uk.po (+704/-0) po/vi.po (+676/-0) po/zh_CN.po (+748/-0) po/zh_TW.po (+710/-0) report/checkbox.js (+16/-0) report/checkbox.xsl (+188/-0) report/styles.css (+258/-0) run (+40/-0) scripts/alsa_record_playback (+7/-0) scripts/ansi_parser (+160/-0) scripts/autotest_filter (+128/-0) scripts/autotest_suite (+118/-0) scripts/cdimage_resource (+95/-0) scripts/compiz-check (+968/-0) scripts/cpu_scaling_test (+525/-0) scripts/cpuinfo_resource (+196/-0) scripts/cycle_vts (+21/-0) scripts/dead_pixel_test (+34/-0) scripts/disk_bench_test (+18/-0) scripts/dpkg_resource (+50/-0) scripts/filter_packages (+179/-0) scripts/filter_templates (+127/-0) scripts/gconf_resource (+95/-0) scripts/gcov_tarball (+11/-0) scripts/gst_pipeline_test (+38/-0) scripts/hal_resource (+476/-0) scripts/internet_test (+143/-0) scripts/keyboard_test (+80/-0) scripts/lsb_resource (+55/-0) scripts/ltp_filter (+90/-0) scripts/ltp_suite (+151/-0) scripts/meminfo_resource (+58/-0) scripts/module_resource (+72/-0) scripts/network_check (+66/-0) scripts/network_test (+25/-0) scripts/package_resource (+119/-0) scripts/phoronix_filter (+148/-0) scripts/phoronix_suite (+307/-0) scripts/qa_regression_suite (+171/-0) scripts/resolution_test (+88/-0) scripts/run_compiz_check (+27/-0) scripts/run_templates (+142/-0) scripts/sleep_test (+440/-0) scripts/suspend_test (+611/-0) scripts/udev_resource (+554/-0) scripts/uname_resource (+38/-0) scripts/xrandr_cycle (+86/-0) setup.cfg (+27/-0) setup.py (+161/-0) test (+179/-0) Conflict adding file .bzr-builddeb. Moved existing file to .bzr-builddeb.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file apport. Moved existing file to apport.moved. Conflict adding file backend. Moved existing file to backend.moved. Conflict adding file bin. Moved existing file to bin.moved. Conflict adding file checkbox. Moved existing file to checkbox.moved. Conflict adding file checkbox_cli. Moved existing file to checkbox_cli.moved. Conflict adding file checkbox_gtk. Moved existing file to checkbox_gtk.moved. Conflict adding file checkbox_urwid. Moved existing file to checkbox_urwid.moved. Conflict adding file configs. Moved existing file to configs.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file examples. Moved existing file to examples.moved. Conflict adding file gtk. Moved existing file to gtk.moved. Conflict adding file icons. Moved existing file to icons.moved. Conflict adding file install. Moved existing file to install.moved. Conflict adding file jobs. Moved existing file to jobs.moved. Conflict adding file man. Moved existing file to man.moved. Conflict adding file patches. Moved existing file to patches.moved. Conflict adding file plugins. Moved existing file to plugins.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file report. Moved existing file to report.moved. Conflict adding file run. Moved existing file to run.moved. Conflict adding file scripts. Moved existing file to scripts.moved. Conflict adding file setup.cfg. Moved existing file to setup.cfg.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. Conflict adding file test. Moved existing file to test.moved. |
||||
| To merge this branch: | bzr merge lp://qastaging/~udienz/ubuntu/natty/checkbox/checkbox.fix.514401 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
| Ubuntu Sponsors | Pending | ||
| Matthias Klose | Pending | ||
| Sebastien Bacher | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2010-12-16.
Unmerged revisions
- 21. By Mahyuddin Susanto
-
* Fixed several strings appear in English although translated (LP: #514401)
+ jobs/fingerprint.txt.in
+ jobs/media.txt.in
+ jobs/monitor.txt.in
+ jobs/sleep.txt.in
+ po/checkbox.pot
* Fixed grammar (LP: #525454)
+ jobs/fingerprint.txt.in
* Removing directory produced from building
- build - 20. By Matthias Klose
-
Hack to work around internals of ConfigParser in python2.7. LP: #689140.
- 19. By Marc Tardif
-
New upstream release (LP: #638333):
* Fixed verification of SSL validity (LP: #625076)
* Improved audio test questions. - 18. By Marc Tardif
-
New upstream release (LP: #617583):
* Fixed sleep_test to check the connection if using network-manager.
* Fixed reporting bugs against alsa-base and xorg (LP: #607214)
* Fixed apport dialog no longer appearing (LP: #607217)
* Reduced data file size for the desktop image.
* Updated report to be more pretty. - 17. By Marc Tardif
-
New upstream release (LP: #597295):
* Added support for urwid interface.
* Added sound check test.
* Added document viewer test.
* Added update-manager and nautilus tests.
* Added resolution tests.
* Added sleep tests. - 16. By Marc Tardif
-
New upstream release (LP: #585132):
* Added media tests (LP: #397944)
* Added support for comments in templates.
* Added referer when sending submissions to Launchpad (LP: #550973)
* Added suggests to checkbox package in debian/control file (LP: #352740)
* Fixed udev_resource script to be more resilient (LP: #556824)
* Fixed cdimage_resource script to read casper.log (LP: #558728)
* Fixed reporting all resources found for a job (LP: #560948)
* Fixed stalling when using kdesudo to start backend (LP: #557443)
* Fixed starting the appropriate default browser on UNR (LP: #563050)
* Fixed ansi_parser script when outputting to stdout (LP: #560952)
* Fixed opening the report with the gconf preferred browser (LP: #562580)
* Fixed suspend_test to use relative time for wakealarm (LP: #349768)
* Fixed backend not getting terminated upon closing (LP: #553328) - 15. By Marc Tardif
-
New upstream release (LP: #548800):
* Added cpu_scaling_test script.
* Fixed hard drive detection (LP: #549714)
* Fixed backend to handle empty messages (LP: #536645)
* Fixed parsing of package resource (LP: #539691)
* Fixed malformed xml report (LP: #485445)
* Fixed running root manual tests as normal user (LP: #383559)
* Fixed writing apport files only after submitting (LP: #530380)
* Fixed audio test instructions (LP: #529205)
* Fixed gathering chassis information (LP: #537435)
* Fixed detection of disks in kvm (LP: #552998)
* Fixed udev_resource script to be more resilient (LP: #552999)
* Fixed filter_packages script to use new resources. - 14. By Mathias Gug
-
[ Marc Tardif ]
New upstream release (LP: #532882):
* Introduced job_prompt plugin to treat all jobs (suites, tests, etc.) as composites.
* Replaced the registry and resource scripts and centralized job iteration.
* Replaced dependency on dbus by using sudo/gksu/kdesudo instead.
* Replaced mktemp with mkdtemp for security purposes.
* Fixed strings in fingerprint and modem tests (LP: #457759)
* Fixed client side validation of Launchpad form (LP: #438671)
* Added device information to tags when reporting bugs with apport.
* Added shorthands for blacklist-file and whitelist-file.
* Added support for apport default configuration (LP: #465447)
* Added support for scrolled options list (LP: #411526)
* Added support for tests generated by suites to run as root.
* Added support for requirements in attachments.
* Added support for armv7l processor
* Added Autotest integration
* Added LTP integration
* Added Phoronix integration
* Added qa-regression-testing integration - 13. By Marc Tardif
-
Added support for apport default configuration (LP: #465447)
- 12. By Marc Tardif
-
* Fixed translation of suites and tests files (LP: #456115)
* Fixed checking the status of command registries (LP: #457502)
* Fixed selecting suites in the command line (LP: #457559)
* Fixed reporting of bugs to contain test description (LP: #427932)
* Fixed execute permissions on scripts (LP: #459606)
* Renamed processors_info plugin to singular because processor
information is reported as a single structure with a count attribute
* Updated translation files.
