Merge lp:~veebers/unity8/remove_fullscreen_argument into lp:unity8

[Christopher Lee]

Removes passing -fullscreen to unity8 when on the device (as per bug #1235065)

Removes passing -fullscreen to unity8 when on the device (as per bug #1235065)

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:385
http://jenkins.qa.ubuntu.com/job/unity8-ci/1255/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2292
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1255
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/391
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2294
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1981

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1255/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/569/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2686
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4517
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2293/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/573
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/573/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/573
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/392
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2295
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2295/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1968/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1983/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Failures were due to missing access to the local archive to resolve package updates. This should now be fixed.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2013-09-13 18:09:42 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2013-10-04 03:28:04 +0000
@@ -103,9 +103,8 @@
         width = getattr(self, 'app_width', 0)
         height = getattr(self, 'app_height', 0)
         scale_divisor = 1
-        if width == 0 and width == 0:
-            self.unity_geometry_args = ['-fullscreen']
-        else:
+        self.unity_geometry_args = []
+        if width > 0 and height > 0:
             if self._geo_larger_than_display(width, height):
                 scale_divisor = self._get_scaled_down_geo(width, height)
                 width = width / scale_divisor