Merge branch 'feature/coverage_eipbootstrapper' into develop

2 files changed, 47 insertions, 5 deletions

diff --git a/src/leap/crypto/tests/eip-service.json b/src/leap/crypto/tests/eip-service.json
new file mode 100644
index 00000000..24df42a2
--- /dev/null
+++ b/src/leap/crypto/tests/eip-service.json
@@ -0,0 +1,43 @@
+{
+  "gateways": [
+    {
+      "capabilities": {
+        "adblock": false, 
+        "filter_dns": false, 
+        "limited": true, 
+        "ports": [
+          "1194", 
+          "443", 
+          "53", 
+          "80"
+        ], 
+        "protocols": [
+          "tcp", 
+          "udp"
+        ], 
+        "transport": [
+          "openvpn"
+        ], 
+        "user_ips": false
+      }, 
+      "host": "harrier.cdev.bitmask.net", 
+      "ip_address": "199.254.238.50", 
+      "location": "seattle__wa"
+    }
+  ], 
+  "locations": {
+    "seattle__wa": {
+      "country_code": "US", 
+      "hemisphere": "N", 
+      "name": "Seattle, WA", 
+      "timezone": "-7"
+    }
+  }, 
+  "openvpn_configuration": {
+    "auth": "SHA1", 
+    "cipher": "AES-128-CBC", 
+    "tls-cipher": "DHE-RSA-AES128-SHA"
+  }, 
+  "serial": 1, 
+  "version": 1
+}
\ No newline at end of file
diff --git a/src/leap/crypto/tests/fake_provider.py b/src/leap/crypto/tests/fake_provider.py
index f86d5ca9..54af485d 100755
--- a/src/leap/crypto/tests/fake_provider.py
+++ b/src/leap/crypto/tests/fake_provider.py
@@ -306,9 +306,7 @@ class FileModified(File):
         since = request.getHeader('if-modified-since')
         if since:
             tsince = time.strptime(since.replace(" GMT", ""))
-            tfrom = time.strptime(time.ctime(os.path.getmtime(
-                os.path.join(_here,
-                             "test_provider.json"))))
+            tfrom = time.strptime(time.ctime(os.path.getmtime(self.path)))
             if tfrom > tsince:
                 return File.render_GET(self, request)
             else:
@@ -350,12 +348,13 @@ def get_provider_factory():
     config = Resource()
     config.putChild(
         "eip-service.json",
-        File("./eip-service.json"))
+        FileModified(
+            os.path.join(_here, "eip-service.json")))
     apiv1 = Resource()
     apiv1.putChild("config", config)
     apiv1.putChild("sessions", API_Sessions())
     apiv1.putChild("users", FakeUsers(None))
-    apiv1.putChild("cert", File(
+    apiv1.putChild("cert", FileModified(
         os.path.join(_here,
                      'openvpn.pem')))
     root.putChild("1", apiv1)