Merge branch '4.9'

systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py

@@ -66,7 +66,7 @@ class CsFile:
         logging.info("Wrote edited file %s" % self.filename)
         self.config = list(self.new_config)
         logging.info("Updated file in-cache configuration")
-        
+
 
     def dump(self):
         for line in self.new_config:
@@ -143,7 +143,7 @@ class CsFile:
             print ' line = ' +line
             if line.lstrip().startswith(ignoreLinesStartWith):
                 continue
-            if re.search(search, line):
+            if search in line:
                 found = True
                 break
 
@@ -157,7 +157,7 @@ class CsFile:
         for index, line in enumerate(self.new_config):
             if line.lstrip().startswith("#"):
                 continue
-            if not re.search(search, line):
+            if search not in line:
                 temp_config.append(line)
 
         self.new_config = list(temp_config)

test/integration/component/test_vpn_users.py

@@ -77,7 +77,7 @@ class Services:
                                 },
                          "vpn_user": {
                                    "username": "test",
-                                   "password": "test",
+                                   "password": "p@a#s=s.w_o-r+d",
                                 },
                          "natrule": {
                                    "privateport": 1701,