~ubuntu-branches/debian/stretch/fuel-agent/stretch

« back to all changes in this revision

Viewing changes to fuel_agent/tests/test_grub_utils.py

  • Committer: Package Import Robot
  • Author(s): Thomas Goirand
  • Date: 2016-03-16 17:12:17 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20160316171217-p5b360dfuxm5yidy
Tags: 9.0~0+2016.03.09.git.b1ba4b7747+dfsg1-1
* New upstream release based on commit b1ba4b7747.
* Uploading to unstable.
* Lots of tweaks to make Debian provisionning works.
* Standards-Version: 3.9.7 (no change).

Show diffs side-by-side

added added

removed removed

Lines of Context:
398
398
        mock_initrd.return_value = 'initrd-version'
399
399
        config = """
400
400
default=0
401
 
timeout=5
 
401
timeout=10
402
402
title Default (kernel-version)
403
403
    kernel /kernel-version kernel-params
404
404
    initrd /initrd-version
456
456
        mock_mkconfig.return_value = '/sbin/grub-mkconfig'
457
457
        mock_conf.return_value = '/boot/grub/grub.cfg'
458
458
        orig_content = """foo
 
459
GRUB_HIDDEN_TIMEOUT=5
 
460
GRUB_HIDDEN_TIMEOUT_QUIET=true
 
461
GRUB_TIMEOUT=5
459
462
GRUB_CMDLINE_LINUX="kernel-params-orig"
460
463
bar"""
461
464
        new_content = """foo
 
465
GRUB_TIMEOUT=10
462
466
GRUB_CMDLINE_LINUX="kernel-params-new"
463
467
bar
464
468
GRUB_RECORDFAIL_TIMEOUT=10