summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorSriram Viswanathan <sriramv@thoughtworks.com>2017-03-29 19:13:50 -0300
committerTulio Casagrande <tcasagra@thoughtworks.com>2017-03-30 13:52:58 -0300
commitf46ae977970e5cb21a22ded01213a760d9ae3d82 (patch)
treed607769d5e8e30c0e72bfa2c1f743dcb5d8165ee /service
parentb4863e988a760315fa70aaf652c1e1bfde63903e (diff)
[#1018] Upgrades twisted from 16.1.1 to 17.1.0
Diffstat (limited to 'service')
-rw-r--r--service/requirements.txt2
-rw-r--r--service/test/unit/config/test_site.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/service/requirements.txt b/service/requirements.txt
index 3ddb02df..16fc0e0e 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -5,7 +5,7 @@ pyasn1==0.1.9
requests==2.11.1
srp==1.0.6
whoosh==2.6.0
-Twisted==16.1.1
+Twisted==17.1.0
-e 'git+https://0xacab.org/leap/leap_pycommon.git@master#egg=leap.common'
-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@development#egg=leap.bitmask'
-e 'git+https://0xacab.org/pixelated/soledad.git@development#egg=leap.soledad.common&subdirectory=common/'
diff --git a/service/test/unit/config/test_site.py b/service/test/unit/config/test_site.py
index 896126ec..64a8b68a 100644
--- a/service/test/unit/config/test_site.py
+++ b/service/test/unit/config/test_site.py
@@ -17,7 +17,7 @@
from twisted.trial import unittest
from mock import MagicMock
from pixelated.config.site import PixelatedSite
-from twisted.protocols.basic import LineReceiver
+from twisted.web.test.requesthelper import DummyChannel
class TestPixelatedSite(unittest.TestCase):
@@ -52,7 +52,7 @@ class TestPixelatedSite(unittest.TestCase):
self.assertFalse(request.responseHeaders.hasHeader('Strict-Transport-Security'.lower()))
def create_request(self):
- channel = LineReceiver()
+ channel = DummyChannel()
channel.site = PixelatedSite(MagicMock())
request = PixelatedSite.requestFactory(channel=channel, queued=True)
request.method = "GET"