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

mozilla-services · Jul 20, 2012 · 85a5b3b · 85a5b3b
2 parents 116050a + 01e720d
commit 85a5b3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/Makefile b/docs/Makefile
@@ -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

diff --git a/loadtest/loadtest.py b/loadtest/loadtest.py
@@ -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