test: fix failure under cygwin python caused by line endings

reading config.ini files under cygwin python results in \r\n
terminated lines which do not compare properly with the success
conditions.

replace \r\n with \n when required.

Author: rouilj

test/test_admin.py

@@ -62,6 +62,13 @@ def find_in_file(filename, regexp):
     with open(filename) as f:
         contents = f.read()
 
+    try:
+        # handle text files with \r\n line endings
+        contents.index("\r")
+        contents = contents.replace("\r\n", "\n")
+    except ValueError:
+        pass
+
     m = re.search(regexp, contents, re.MULTILINE)
 
     if not m: return False

test/test_demo.py

@@ -50,7 +50,14 @@ def run_install_demo(self, template, db="anydbm"):
 
         # verify that db was set properly by reading config
         with open(self.home + "/config.ini", "r") as f:
-            config_lines = f.readlines()
+            config_lines = f.read().replace("\r\n", "\n")
+
+        try:
+            # handle text files with \r\n line endings
+            config_lines.index("\r")
+            config_lines = config_lines.replace("\r\n", "\n")
+        except ValueError:
+            pass
 
         self.assertIn("backend = %s\n"%db, config_lines)
 
@@ -88,7 +95,14 @@ def testDemoJinja(self):
 
         # verify that template was set to jinja2 by reading config
         with open(self.home + "/config.ini", "r") as f:
-            config_lines = f.readlines()
+            config_lines = f.read()
+
+        try:
+            # handle text files with \r\n line endings
+            config_lines.index("\r")
+            config_lines = config_lines.replace("\r\n", "\n")
+        except ValueError:
+            pass
 
         self.assertIn("template_engine = jinja2\n", config_lines)