← Back to branch summary

~didrocks/oneconf/testmerge

« back to all changes in this revision

Viewing changes to oneconf/paths.py

  • Committer: Didier Roche
  • Date: 2012-06-08 12:53:35 UTC
  • Revision ID: didrocks@ubuntu.com-20120608125335-uaaybriflyoeei8o
https://launchpad.net/bugs/1010239
handle a regression when the wallpaper isn't reachable + test case
(LP: #1010239)

Show diffs side-by-side

added added

removed removed

Lines of Context:
oneconf/paths.py
48
48
    ONECONF_CACHE_DIR = config.get('TestSuite', 'ONECONF_CACHE_DIR')
49
49
    WEBCATALOG_SILO_DIR = config.get('TestSuite', 'WEBCATALOG_SILO_DIR')
50
50
    FAKE_WALLPAPER = os.path.join(os.path.dirname(_datadir), config.get('TestSuite', 'FAKE_WALLPAPER'))
51
 
    FAKE_WALLPAPER_MTIME = config.get('TestSuite', 'FAKE_WALLPAPER_MTIME')
 
51
    try:
 
52
        FAKE_WALLPAPER_MTIME = config.get('TestSuite', 'FAKE_WALLPAPER_MTIME')
 
53
    except ConfigParser.NoOptionError:
 
54
        FAKE_WALLPAPER_MTIME = None
52
55
except ConfigParser.NoSectionError:
53
56
    pass
54
57
WEBCATALOG_SILO_SOURCE = os.path.join(WEBCATALOG_SILO_DIR, "source")