Merge lp:~doanac/utah/booted-bug1155037 into lp:utah

[Andy Doan]

This adds another message to grep for when detecting if the network is active. It was tested on alderamin with:

${PYTHONPATH}/examples/run_utah_tests.py -d -p lp:ubuntu-test-cases/server/preseeds/minimal-virtual.preseed -i ${ISO} lp:ubuntu-test-cases/server/runlists/minimal-virtual.run -x /etc/utah/bridged-network-vm.xml

[Max Brustkern (nuclearbob)]

Are inline comments something we don't like, or do I just remember removing those in cases where the lines were too long? The actual part of this looks good.

[Javier Collado (javier.collado)]

I think inline comments are fine. The only requirement to be pep8 compliant,
aside from line length, is to use two whitespace characters before the hash
character.

[Javier Collado (javier.collado)]

By the way, line 166 in utah/config.py ins't passing pep8 checks because it's
too long:

>> '.*finish-install.d/94save-logs', # needed for server bootspeed

I know it's not part of this merge request, but probably it doesn't make any
harm to fix that here.

[Max Brustkern (nuclearbob)]

I'd like to try to get all of the outstanding branches merged and start testing the new stable version today, so if you don't have a chance to make this change before 1800 UTC, I'll probably go ahead and merge with that change in place.

review: Approve

[Andy Doan (doanac)]

On 03/18/2013 08:11 AM, Javier Collado wrote:
> By the way, line 166 in utah/config.py ins't passing pep8 checks because it's
> too long:
>
>>> >> '.*finish-install.d/94save-logs', # needed for server bootspeed
> I know it's not part of this merge request, but probably it doesn't make any
> harm to fix that here.

crap - I use pylint which doesn't complain about column 79 stuff. By
memory I always limit to 80. i'll fix.

=== modified file 'utah/config.py'
--- utah/config.py	2013-03-15 13:31:22 +0000
+++ utah/config.py	2013-03-15 15:58:27 +0000
@@ -186,7 +186,10 @@
         },
         {
             'message': 'network active',
-            'pattern': '.*NetworkManager',
+            'pattern': [
+                '.*NetworkManager',
+                '.*dhclient: bound to',  # needed for minimal server installs
+            ],
             'timeout': 180,
         }
     ],