Merge lp:~hggdh2/ubuntu-server-iso-testing/usit-mail-server into lp:ubuntu-server-iso-testing

[C de-Avillez]

Simple change, splitting the Dovecot check into IPv4 and IPv6. We are now enabling IPv6 by default on Oneiric.

[James Page (james-page)]

Looks good to me - please feel free to merge with trunk.

=== modified file 'templates/test_cases/mail-server/test'
--- templates/test_cases/mail-server/test	2010-12-01 17:48:05 +0000
+++ templates/test_cases/mail-server/test	2011-07-13 21:27:30 +0000
@@ -49,8 +49,17 @@
         mbox = mailbox.mbox(spool_file)
         self.assertEquals(len(mbox.keys()), 1, mbox)
 
-    def testDovecot(self):
-        cmd = ["netstat", "-ltnp"]
+    def testDovecotTcp4(self):
+        cmd = ["netstat", "-4", "-ltnp"]
+        logging.debug("Cmd: %s" % (cmd))
+        output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
+        logging.debug("Cmd output: %s" % (output))
+        output2 = filter(lambda l: l.split()[6].split('/')[1] == 'dovecot',
+                         output.strip().split('\n')[2:])
+        self.assertEquals(len(output2), 4, output2)
+
+    def testDovecotTcp6(self):
+        cmd = ["netstat", "-6", "-ltnp"]
         logging.debug("Cmd: %s" % (cmd))
         output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
         logging.debug("Cmd output: %s" % (output))