shen/pyspider
1
0
Fork 0
mirror of https://github.com/binux/pyspider.git synced 2024-11-25 16:34:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix path in MANIFEST.in

Browse Source
This commit is contained in:
binux 2015-01-29 00:08:21 +08:00
parent 47a072a5b9
commit d1713733ca
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -4,4 +4,4 @@ include Dockerfile
include LICENSE
include pyspider/logging.conf
include pyspider/webui/static/*
include pyspider/templates/*
include pyspider/webui/templates/*

12
tests/test_fetcher_processor.py
View File

@ -12,6 +12,7 @@ import json
import time
import httpbin
import pyproxy
import subprocess
import unittest2 as unittest
try:
from Queue import Queue
@ -34,10 +35,11 @@ class TestFetcherProcessor(unittest.TestCase):
self.result_queue = Queue()
self.httpbin_thread = utils.run_in_subprocess(httpbin.app.run, port=14887)
self.httpbin = 'http://127.0.0.1:14887'
self.proxy_thread = utils.run_in_subprocess(pyproxy.main,
username='binux',
password='123456',
port=14830)
self.proxy_thread = subprocess.Popen(['pyproxy',
'--username=binux',
'--password=123456',
'--port=14830'],
close_fds=True)
self.proxy = '127.0.0.1:14830'
self.processor = Processor(projectdb=self.projectdb,
inqueue=None,
@ -50,7 +52,7 @@ class TestFetcherProcessor(unittest.TestCase):
@classmethod
def tearDownClass(self):
self.proxy_thread.terminate()
self.proxy_thread.join()
self.proxy_thread.wait()
self.httpbin_thread.terminate()
self.httpbin_thread.join()