Make the tests a bit more robust

Author: Cito

webware/MiscUtils/Tests/TestFuncs.py

@@ -90,13 +90,15 @@ def testLocalIP(self):
         self.assertFalse(ip.startswith('127.'))
         self.assertEqual(localIP(), ip)  # second invocation
         self.assertEqual(localIP(useCache=None), ip)
-        self.assertEqual(
-            localIP(remote=None, useCache=None), ip,
+        # ignore if the following tests fetch the WSL address
+        ips = (ip, '192.168.80.1', '172.25.112.1')
+        self.assertIn(
+            localIP(remote=None, useCache=None), ips,
             'See if this works: localIP(remote=None).'
             ' If this fails, dont worry.')
-        self.assertEqual(
+        self.assertIn(
             localIP(remote=('www.hostname.and.domain.are.invalid', 80),
-                    useCache=None), ip)
+                    useCache=None), ips)
 
     def testPositiveId(self):
         # About all we can do is invoke positiveId()

webware/Tests/TestEndToEnd/TestExamples.py

@@ -2,6 +2,7 @@
 
 import os
 import unittest
+from time import sleep
 
 from .AppTest import AppTest
 
@@ -19,7 +20,11 @@ def setUp(self):
     @staticmethod
     def removeDemoDatabase():
         if os.path.exists('demo.db'):
-            os.remove('demo.db')
+            try:
+                os.remove('demo.db')
+            except OSError:
+                sleep(1)
+                os.remove('demo.db')
 
     def testStartPage(self):
         r = self.testApp.get('/')