← Back to branch summary

~ubuntu-branches/ubuntu/wily/system-image/wily-proposed

« back to all changes in this revision

Viewing changes to systemimage/tests/test_config.py

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Barry Warsaw, Ubuntu daily release
  • Date: 2014-08-01 18:33:39 UTC
  • mfrom: (1.2.25)
  • Revision ID: package-import@ubuntu.com-20140801183339-2h07hrgk8y8eibkn
Tags: 2.3.2-0ubuntu2
https://launchpad.net/bugs/1349478
[ Barry Warsaw ]
* New upstream release.
  - LP: #1349478 - When system-image-{cli,dbus} is run as non-root, use
    a fallback location for the settings.db file, if the parent
    directory isn't writable.
* d/control:
  - Bump X-Python3-Version to (Python) 3.4.
  - Update run-time dependencies so that system-image-common now depends
    on python3-dbus and python3-xdg, while -dbus and -cli only need to
    depend on system-image-common.

[ Ubuntu daily release ]
* New rebuild forced

Show diffs side-by-side

added added

removed removed

Lines of Context:
systemimage/tests/test_config.py
28
28
 
29
29
from datetime import timedelta
30
30
from pkg_resources import resource_filename
31
 
from subprocess import check_output
 
31
from subprocess import CalledProcessError, check_output
32
32
from systemimage.config import Configuration
33
33
from systemimage.device import SystemProperty
34
34
from systemimage.reboot import Reboot
198
198
        config = Configuration()
199
199
        # Silence the log exceptions this will provoke.
200
200
        with patch('systemimage.device.logging.getLogger'):
201
 
            self.assertEqual(config.device, '?')
 
201
            # It's possible getprop actually does exist on the system.
 
202
            with patch('systemimage.device.check_output',
 
203
                       side_effect=CalledProcessError(1, 'ignore')):
 
204
                self.assertEqual(config.device, '?')
202
205
 
203
206
    @configuration
204
207
    def test_get_channel(self, ini_file):