Merge lp:~bladernr/checkbox/1100594-fix-camera_test-new-gir1.2 into lp:checkbox
Proposed by
Jeff Lane
Status: | Merged |
---|---|
Approved by: | Brendan Donegan |
Approved revision: | 2104 |
Merged at revision: | 2101 |
Proposed branch: | lp:~bladernr/checkbox/1100594-fix-camera_test-new-gir1.2 |
Merge into: | lp:checkbox |
Diff against target: |
279 lines (+79/-47) 3 files modified
debian/changelog (+3/-0) jobs/camera.txt.in (+0/-1) scripts/camera_test (+76/-46) |
To merge this branch: | bzr merge lp:~bladernr/checkbox/1100594-fix-camera_test-new-gir1.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brendan Donegan (community) | Approve | ||
Jeff Lane | Needs Resubmitting | ||
Review via email: mp+162209@code.launchpad.net |
Description of the change
fixes camera test by adding bits to determine what version of gst we're using and then set the plugin and video type appropriately for either 0.10 or 1.x. This resolves a problem when fswebcam is not present and we fall back to gst.
Fixed the error handling for the fswebcam call to avoid having nested tracebacks that can be confusing. Now if the call to fswebcam fails, we instead trap the error and run the fallback code outside the exception. If THAT fails, we'll get a less confusing traceback now.
Removed an extraneous line in the requires for one of the camera test jobs (listed gir1.2 twice)
To post a comment you must log in.
There seem to be some pep8 errors in your code related to spacing between ',' mainly. I can't remember for certain but I think this may cause Tarmac to reject the submission. Also I'm curious about the comment about fswebcam above - I have fswebcam installed on my system and still get this error. Is there a further problem in the script related to that? Probably best to check it out now.