fix path in MANIFEST.in

machinewu · Jan 28, 2015 · d171373 · d171373
1 parent 47a072a
commit d171373
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,4 +4,4 @@ include Dockerfile
 include LICENSE
 include pyspider/logging.conf
 include pyspider/webui/static/*
-include pyspider/templates/*
+include pyspider/webui/templates/*
diff --git a/tests/test_fetcher_processor.py b/tests/test_fetcher_processor.py
@@ -12,6 +12,7 @@
 import time
 import httpbin
 import pyproxy
+import subprocess
 import unittest2 as unittest
 try:
     from Queue import Queue
@@ -34,10 +35,11 @@ def setUpClass(self):
         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 @@ def setUpClass(self):
     @classmethod
     def tearDownClass(self):
         self.proxy_thread.terminate()
-        self.proxy_thread.join()
+        self.proxy_thread.wait()
         self.httpbin_thread.terminate()
         self.httpbin_thread.join()