Merge ~paelzer/qa-regression-testing:fix-ntp-artful into qa-regression-testing:master

[Christian Ehrhardt ]

While preparing a re-merge in Artful I found that there were some changes triggered by the latest changes in Debian that are ok, but let one of the testcases break.
This branch fixes test-ntp.py to work again (changes are backwards compatible)

[Tyler Hicks (tyhicks)]

I don't love using /var as the mkdtemp() dir but understand the need.

review: Approve

[Tyler Hicks (tyhicks)]

I've merged this branch. Thanks for these fixes! :)

diff --git a/scripts/test-ntp.py b/scripts/test-ntp.py
index e820481..c69648c 100755
--- a/scripts/test-ntp.py
+++ b/scripts/test-ntp.py
@@ -103,7 +103,7 @@ class NtpTest(testlib.TestlibCase, PrivateNtpTest):
 
     def _setup_keys(self):
         '''Setup public keys'''
-        self.tmpdir = tempfile.mkdtemp(prefix='testlib', dir='/tmp')
+        self.tmpdir = tempfile.mkdtemp(prefix='testlib', dir='/var')
 
         rnd = os.path.join(self.tmpdir, '.rnd')
         os.environ.setdefault('RANDFILE', '')
@@ -198,8 +198,9 @@ keysdir %s
 
         found_cert = False
         pat = re.compile(r'^cert=')
+        pat2 = re.compile(r', cert=')
         for line in report.splitlines():
-            if pat.search(line):
+            if pat.search(line) or pat2.search(line):
                 found_cert = True
                 break