summaryrefslogtreecommitdiff
path: root/src/leap/crypto/tests
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-27 17:50:32 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-27 17:50:32 -0300
commit20875f7a7abcd4b2403add47b5565f1098bb342a (patch)
tree13670b2adc18129b95c1c3977cdd6c64ea08648e /src/leap/crypto/tests
parent1a1cd679a6f6c86ff8965f26f4fc463b98eba4ec (diff)
Improve fake provider implementation
Diffstat (limited to 'src/leap/crypto/tests')
-rwxr-xr-xsrc/leap/crypto/tests/fake_provider.py9
1 files changed, 4 insertions, 5 deletions
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)