From 33bb6c5ed0002105ff293f81e02b94e29e311504 Mon Sep 17 00:00:00 2001 From: Mason Donahue Date: Sun, 31 Aug 2014 15:03:38 -0500 Subject: [PATCH 1/3] Add ctags to gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 6d3f1d6e..c82fed9d 100644 --- a/.gitignore +++ b/.gitignore @@ -37,5 +37,9 @@ nosetests.xml # vim *.swp +# tags +ctags +tags + # OSX .DS_Store From ad2c776a5f10673e942922ba93246174f25690d5 Mon Sep 17 00:00:00 2001 From: Mason Donahue Date: Sun, 31 Aug 2014 15:04:26 -0500 Subject: [PATCH 2/3] Fix socks import issue on Travis; socksipy is ancient and abandoned. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79dd2396..944a9c08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ python: - "2.6" - "2.7" # command to install dependencies -before_install: "sudo apt-get install -y build-essential fakeroot python-all python-stdeb python-flask python-qt4 python-socksipy" -install: "pip install nose flask stem" +before_install: "sudo apt-get install -y build-essential fakeroot python-all python-stdeb python-qt4" +install: "pip install nose flask stem pysocks" # command to run tests script: nosetests test From 15a917c60ecb691ea2dcf09ab4e8bbc6f3fe7bab Mon Sep 17 00:00:00 2001 From: Mason Donahue Date: Sun, 31 Aug 2014 15:06:12 -0500 Subject: [PATCH 3/3] Test fix: OnionShare object doesn't have a port until we tell it to get one. --- test/onionshare_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/onionshare_test.py b/test/onionshare_test.py index afd955b4..b364d950 100644 --- a/test/onionshare_test.py +++ b/test/onionshare_test.py @@ -5,6 +5,7 @@ from nose import with_setup def test_choose_port_returns_a_port_number(): "choose_port() returns a port number" app = OnionShare() + app.choose_port() assert 1024 <= app.port <= 65535 def test_choose_port_returns_an_open_port():