Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noScores into lp:ubuntu-ui-toolkit/staging

noScores
Merge into staging

Proposed by Cris Dywan on 2014-07-21

Status:

Merged

Approved by:

Zoltan Balogh on 2014-07-23

Approved revision:

1147

Merged at revision:

1161

Proposed branch:

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noScores

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

49 lines (+16/-4)

2 files modified

tests/autopilot/ubuntuuitoolkit/fixture_setup.py (+12/-4)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+4/-0)

To merge this branch:

bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noScores

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-22
Leo Arias (community)			Approve on 2014-07-22
Zoltan Balogh		2014-07-21	Approve on 2014-07-21
Review via email: mp+227541@code.launchpad.net

Commit message

Wrap tempfile.NamedTemporaryFile to discard underscored filenames

Revision history for this message

Zoltan Balogh (bzoltan) wrote on 2014-07-21:

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-21:

FAILED: Continuous integration, rev:1144
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/625/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1857/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2076/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/625/rebuild

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noScores updated on 2014-07-21

1145. By Cris Dywan on 2014-07-21: Make pep8 happy again
1146. By Cris Dywan on 2014-07-21: Always remove discarded temporary filename with underscores

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-21:

15 + def _named_temporary_file(self, dir=None, mode='w+t',

Please add a comment on this method about why we are striping the underscores. A link to the bug would be good too.

55 + desktop_file = fixture_setup._named_temporary_file(
56 + suffix='.desktop', dir=desktop_file_dir)

This won't work because it's a method in an object, not in the module. What we need to do is to refactor this test case to use the same fixture. Let me know if you want me to take over that part, using your branch as a prerequisite.

review: Approve

Revision history for this message

Leo Arias (elopio) on 2014-07-21:

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-21:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/629/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-21:

FAILED: Continuous integration, rev:1146
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/631/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2262/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1879/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2098/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/631/rebuild

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noScores updated on 2014-07-22

1147. By Cris Dywan on 2014-07-22: Use tempfile._RandomNameSequence.characters instead of while

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/637/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) on 2014-07-22:

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/646/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/650/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

 === modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
 --- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-06-26 04:03:02 +0000
 +++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-07-22 07:45:42 +0000
@@ -77,18 +77,26 @@
          return qml_file_path, desktop_file_path
      def _write_test_qml_file(self):
--        qml_file = tempfile.NamedTemporaryFile(
--            mode='w+t', suffix='.qml', delete=False)
++        qml_file = self._named_temporary_file(suffix='.qml')
          qml_file.write(self._qml_file_contents)
          qml_file.close()
          return qml_file.name
++    def _named_temporary_file(self, dir=None, mode='w+t',
++                              delete=False, suffix=''):
++        # Discard files with underscores which look like an APP_ID to Unity
++        # See https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1329141
++        chars = tempfile._RandomNameSequence.characters.strip("_")
++        tempfile._RandomNameSequence.characters = chars
++        return tempfile.NamedTemporaryFile(dir=dir, mode=mode,
++                                           delete=delete, suffix=suffix)
++
      def _write_test_desktop_file(self, qml_file_path):
          desktop_file_dir = self._get_local_desktop_file_directory()
          if not os.path.exists(desktop_file_dir):
              os.makedirs(desktop_file_dir)
--        desktop_file = tempfile.NamedTemporaryFile(
--            mode='w+t', suffix='.desktop', dir=desktop_file_dir, delete=False)
++        desktop_file = self._named_temporary_file(suffix='.desktop',
++                                                  dir=desktop_file_dir)
          self._desktop_file_dict['Exec'] = (
              self._desktop_file_dict['Exec'].format(
                  qmlscene=base.get_qmlscene_launch_command(),
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-06-27 22:26:38 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-07-22 07:45:42 +0000
@@ -39,6 +39,10 @@
      desktop_file_dir = get_local_desktop_file_directory()
      if not os.path.exists(desktop_file_dir):
          os.makedirs(desktop_file_dir)
++    # Strip underscores which look like an APP_ID to Unity
++    # See https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1329141
++    chars = tempfile._RandomNameSequence.characters.strip("_")
++    tempfile._RandomNameSequence.characters = chars
      desktop_file = tempfile.NamedTemporaryFile(
          suffix='.desktop', dir=desktop_file_dir, delete=False)
      desktop_file.write(_DESKTOP_FILE_CONTENTS.encode('utf-8'))

Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noScores into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers