Skip to content
This repository has been archived by the owner on Jan 2, 2020. It is now read-only.

Commit

Permalink
[#1018] Upgrades twisted from 16.1.1 to 17.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Sriram Viswanathan authored and Tulio Casagrande committed Mar 30, 2017
1 parent b4863e9 commit f46ae97
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ linters_js:
coverage:
@. $(VIRTUALENV)/bin/activate;\
cd service;\
export PYTHONPATH=$(PYTHONPATH):`pwd`;\
coverage run -p --source=pixelated `which trial` test.unit;\
coverage run -p --source=pixelated `which trial` test.integration;\
coverage combine;\
Expand All @@ -62,6 +63,7 @@ coverage:
unit_tests_py:
@. $(VIRTUALENV)/bin/activate;\
cd service;\
export PYTHONPATH=$(PYTHONPATH):`pwd`;\
trial --reporter=text test.unit

unit_tests_js:
Expand All @@ -71,6 +73,7 @@ unit_tests_js:
integration_tests_py:
@. $(VIRTUALENV)/bin/activate;\
cd service;\
export PYTHONPATH=$(PYTHONPATH):`pwd`;\
trial --reporter=text test.integration

functional_tests: clean requirements install
Expand Down
2 changes: 1 addition & 1 deletion service/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Expand Down
4 changes: 2 additions & 2 deletions service/test/unit/config/test_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -52,7 +52,7 @@ def test_does_not_add_strict_transport_security_header_if_plain_http(self):
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"
Expand Down

0 comments on commit f46ae97

Please sign in to comment.