Merge gpgservice-client:add-pythonpath-hack into gpgservice-client:master

[Thomi Richards]

Allow GPGServiceFixture to work when gpgservice is not in sys.path.

Add an option to set a custom PYTHONPATH, for when the gpgservice python package isn't in the current working directory, or installed to the virtualenv.

[Kit Randel (blr)]

lgtm, despite your gremlins.

review: Approve

diff --git a/gpgservice_client/testing/_fixture.py b/gpgservice_client/testing/_fixture.py
index e447432..8a9a5ad 100644
--- a/gpgservice_client/testing/_fixture.py
+++ b/gpgservice_client/testing/_fixture.py
@@ -26,7 +26,8 @@ class GPGKeyServiceFixture(Fixture):
     """Run the gpgservice webapp and test key server."""
 
     def __init__(self, keyserver_host=None, keyserver_port=None,
-                 gunicorn_path=None, service_start_timeout=5.0):
+                 gunicorn_path=None, service_start_timeout=5.0,
+                 gpgservice_root=None):
         """Create a new GPGKeyServiceFixture.
 
         :param config_fixture: If specified, this must be a ConfigFixture
@@ -37,12 +38,16 @@ class GPGKeyServiceFixture(Fixture):
         :param gunicorn_path: Path to gunicorn binary.
         :param service_start_timeout: The maximum time (in seconds) to wait
             for the gpgservice instance to start responding to HTTP queries.
+        :param gpgservice_root: The path to the gpgservice python package. If
+            specified, it will be added to the PYTHONPATH of the spawned
+            process.
         """
 
         self.keyserver_host = keyserver_host
         self.keyserver_port = keyserver_port
         self.gunicorn_path = gunicorn_path
         self.service_start_timeout = service_start_timeout
+        self.gpgservice_root = gpgservice_root
 
     def setUp(self):
         super(GPGKeyServiceFixture, self).setUp()
@@ -59,6 +64,8 @@ class GPGKeyServiceFixture(Fixture):
         # config file from:
         env = os.environ.copy()
         env['GPGSERVICE_CONFIG_PATH'] = self._config_file.name
+        if self.gpgservice_root:
+            env['PYTHONPATH'] = self.gpgservice_root
 
         if self.gunicorn_path is None:
             self.gunicorn_path = os.path.join('env', 'bin', 'gunicorn')