Permalink
Browse files

Merge branch 'master' of github.com:mozilla-services/tokenserver

  • Loading branch information...
2 parents 116050a + 01e720d commit 85a5b3bde7bc46486f9e90777d5f6715148f66c0 @tarekziade tarekziade committed Jul 20, 2012
Showing with 2 additions and 1 deletion.
  1. +1 −1 docs/Makefile
  2. +1 −0 loadtest/loadtest.py
View
@@ -4,7 +4,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
ifndef SPHINXBUILD
-SPHINXBUILD = sphinx-build
+SPHINXBUILD = ../bin/sphinx-build
endif
PAPER =
BUILDDIR = build
View
@@ -65,6 +65,7 @@ def setUp(self):
def _do_token_exchange(self, assertion, status=200):
self.setHeader('Authorization', 'Browser-ID %s' % assertion)
+ self.setHeader('X-Conditions-Accepted', 'true')
res = self.get(self.root + self.token_exchange, ok_codes=[status])
self.assertEquals(res.code, status)
return res

0 comments on commit 85a5b3b

Please sign in to comment.