lpsetup

Merge lp://staging/~gary/lpsetup/paralleltweaks into lp://staging/lpsetup

  1. paralleltweaks
  2. Merge into trunk
Proposed by Gary Poster
Status: Merged
Approved by: Brad Crittenden
Approved revision: 35
Merged at revision: 38
Proposed branch: lp://staging/~gary/lpsetup/paralleltweaks
Merge into: lp://staging/lpsetup
Diff against target: 72 lines (+34/-8)
3 files modified
lpsetup/subcommands/lxcinstall.py (+19/-7)
lpsetup/templates/lp-setup-lxc-test (+1/-1)
lpsetup/templates/networking.conf (+14/-0)
To merge this branch: bzr merge lp://staging/~gary/lpsetup/paralleltweaks
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Gary Poster (community) Approve
Review via email: mp+112438@code.staging.launchpad.net

Commit message

add the tweaks necessary for bug 1013921 and bug 1014916

Description of the change

This branch adds the tweaks necessary for bug 1013921 and bug 1014916.

 * For 1013921, make lp-setup-lxc-test include -vvv when calling bin/test so that testr gets test timings and can better balance tests.
 * For 1014916, only when the container OS is Lucid (not necessary for Precise), do the following:
   * Change /var/lib/lxc/lptests/rootfs/etc/init/networking.conf to not wait for udev (that is, use start on (local-filesystems))
   * in the host remove the container's /etc/init/udevtrigger.conf (rm /var/lib/lxc/lptests/rootfs/etc/init/udevtrigger.conf

See the relevant bugs for the reasoning, if desired.

Given our lack of integration tests, I manually tested this on ec2 and it seems to be fine.

Thank you

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Ah right: I also changed the application of the fix for bug 974584 to only happen for lucid, as described by the preexisting comment.

review: Approve
Revision history for this message
Gary Poster (gary) wrote :

Oops, didn't mean to approve.

Revision history for this message
Brad Crittenden (bac) wrote :

This branch looks good. Thanks for the fixes Gary.

review: Approve (code)
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :
Download full text (6.8 KiB)

The attempt to merge lp:~gary/lpsetup/paralleltweaks into lp:lpsetup failed. Below is the output from the failed tests.

nose.plugins.cover: ERROR: Coverage not available: unable to import coverage module
EEEEE...................EE
======================================================================
ERROR: Failure: ImportError (No module named shelltoolbox)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 390, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/tests/subcommands/test_get.py", line 9, in <module>
    from lpsetup import handlers
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/handlers.py", line 21, in <module>
    from shelltoolbox import (
ImportError: No module named shelltoolbox

======================================================================
ERROR: Failure: ImportError (No module named shelltoolbox)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 390, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/tests/subcommands/test_inithost.py", line 9, in <module>
    from lpsetup import handlers
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/handlers.py", line 21, in <module>
    from shelltoolbox import (
ImportError: No module named shelltoolbox

======================================================================
ERROR: Failure: ImportError (No module named shelltoolbox)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 390, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/tests/subcommands/test_install.py", line 9, in <module>
    from lpsetup import handlers
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/handlers.py", line 21, in <module>
    from shelltoolbox import (
ImportError: No module named shelltoolbox

======================================================================
ERROR: Failure: ImportError (No module named shelltoolbox)
-----------------------------------------------------...

Read more...

Revision history for this message
Launchpad QA Bot (lpqabot) wrote :
Download full text (3.4 KiB)

The attempt to merge lp:~gary/lpsetup/paralleltweaks into lp:lpsetup failed. Below is the output from the failed tests.

nose.plugins.cover: ERROR: Coverage not available: unable to import coverage module
......................................................................EEE..
======================================================================
ERROR: test_idempotent (lpsetup.tests.test_utils.ScrubberTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/tests/test_utils.py", line 234, in test_idempotent
    self.lxc_pattern, get_running_containers())
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/utils.py", line 208, in __init__
    self.ignored_containers = list(ignored_containers)
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/utils.py", line 116, in get_running_containers
    containers = run('lxc-ls').split()
  File "/usr/lib/python2.7/dist-packages/shelltoolbox/__init__.py", line 418, in run
    close_fds=kwargs.pop('close_fds', True), **kwargs)
  File "/usr/lib/python2.7/subprocess.py", line 679, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

======================================================================
ERROR: test_scrub (lpsetup.tests.test_utils.ScrubberTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/tests/test_utils.py", line 218, in test_scrub
    self.lxc_pattern, get_running_containers())
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/utils.py", line 208, in __init__
    self.ignored_containers = list(ignored_containers)
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/utils.py", line 116, in get_running_containers
    containers = run('lxc-ls').split()
  File "/usr/lib/python2.7/dist-packages/shelltoolbox/__init__.py", line 418, in run
    close_fds=kwargs.pop('close_fds', True), **kwargs)
  File "/usr/lib/python2.7/subprocess.py", line 679, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

======================================================================
ERROR: test_scrub_no_dir (lpsetup.tests.test_utils.ScrubberTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/tests/test_utils.py", line 228, in test_scrub_no_dir
    self.lxc_pattern, get_running_containers())
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/utils.py", line 208, in __init__
    self.ignored_containers = list(ignored_containers)
  File "/home/tarmac/repos/lpsetup/trunk/lpsetup/utils.py", line 116, in get_running_containers
    containers = run('lxc-ls').split()
  File "/usr/lib/python2.7/dist-packages/shelltoolbox/__init__.py", line 418, in run
    close_fds=kwargs.pop('close_fds', True), **kwargs)
  File "/usr/lib/python2.7/subprocess.py", line 679, in __in...

Read more...

Revision history for this message
Brad Crittenden (bac) wrote :

Gary sorry I have taken your MP hostage as I work through these tarmac issues.

Revision history for this message
Gary Poster (gary) wrote :

:-) yay, it worked! Thank you

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: