Merge lp:~bac/launchpad/bug-981114 into lp:launchpad

[Brad Crittenden]

Set /etc/mailname for the containers to avoid errors caused by no bzr whoami.

= Summary =

Tests fail if /etc/mailname is not set, which is not a problem for
developer machines but is for lxc containers.

== Proposed fix ==

Set /etc/mailname to be 'localhost'.

== Pre-implementation notes ==

Discussions with Gary.

== Implementation details ==

As above.

== Tests ==

None

== Demo and Q/A ==

Run setuplxc and verify /etc/mailname is there and that the following
tests pass:

bin/test -vvt test_uncommit_branch

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  utilities/setuplxc.py

[Gary Poster (gary)]

Cool thank you

review: Approve

[Gary Poster (gary)]

I talked with bac about making the file from the host in Python rather than in the container via bash. I didn't care a ton, but he said he would pursue.

[Brad Crittenden (bac)]

I made the change to update the file via the slave host. Good suggestion.

=== modified file 'utilities/setuplxc.py'
--- utilities/setuplxc.py	2012-03-30 15:00:46 +0000
+++ utilities/setuplxc.py	2012-04-16 12:44:28 +0000
@@ -58,6 +58,7 @@
 HOST_PACKAGES = ['ssh', 'lxc', 'libvirt-bin', 'bzr', 'testrepository',
     'python-shell-toolbox']
 HOSTS_FILE = '/etc/hosts'
+MAILNAME_FILE = '/etc/mailname'
 LP_APACHE_MODULES = 'proxy proxy_http rewrite ssl deflate headers'
 LP_APACHE_ROOTS = (
     '/var/tmp/bazaar.launchpad.dev/static',
@@ -1111,6 +1112,13 @@
     # ephemeral container
     root_sshcall('mkdir -p /rootfs/usr/lib')
     root_sshcall('ln -s /usr/lib/graphviz /rootfs/usr/lib/graphviz')
+    # XXX: BradCrittenden 2012-04-13 bug=981114: Manually create /etc/mailname
+    # or bzrlib gets upset and returns None,None for whoami causing test
+    # failures.
+    mailname_file = get_container_path(lxcname, MAILNAME_FILE)
+    if not os.path.exists(mailname_file):
+        with open(mailname_file, 'w') as fd:
+            fd.write('localhost')
 
 
 def stop_lxc(lxcname, ssh_key_path):