Merge ~paelzer/qa-regression-testing:fix-dovecot-bionic into qa-regression-testing:master

[Christian Ehrhardt ]

Hi,
as part of the dovecot merge for bionic I found that this will need to be changed once the migration is complete.
I also re-found the issue of the slow starting service, but that the repo (but not the dep8 in the package) had a fix for.

It brings back the discussion of making the lib a package or fetching it in the tests, but for now just the simple small change that the banner will be visible again in 18.04

[Steve Beattie (sbeattie)]

Thanks, looks good. Merging.

review: Approve

diff --git a/scripts/test-dovecot.py b/scripts/test-dovecot.py
index 7d149c5..6dffc77 100755
--- a/scripts/test-dovecot.py
+++ b/scripts/test-dovecot.py
@@ -147,7 +147,8 @@ Get cracking!''')
     def test_pop3(self):
         '''Test POP3 protocol'''
 
-        if self.lsb_release['Release'] == 14.04:
+        if (self.lsb_release['Release'] == 14.04 or
+           self.lsb_release['Release'] >= 18.04):
             message = '+OK Dovecot (Ubuntu) ready.'
         else:
             message = '+OK Dovecot ready.'
@@ -160,7 +161,8 @@ Get cracking!''')
     def test_pop3s(self):
         '''Test POP3S protocol'''
 
-        if self.lsb_release['Release'] == 14.04:
+        if (self.lsb_release['Release'] == 14.04 or
+           self.lsb_release['Release'] >= 18.04):
             message = '+OK Dovecot (Ubuntu) ready.'
         else:
             message = '+OK Dovecot ready.'