providers/plainbox-provider-checkbox: increment version to 0.16.1plainbox-provider-checkbox-v0.16.1

2 files changed, 14 insertions, 8 deletions

diff --git a/bin/piglit_test b/bin/piglit_test
index f03e628..c8eacfc 100755
--- a/bin/piglit_test
+++ b/bin/piglit_test
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from argparse import ArgumentParser, FileType
+from argparse import ArgumentParser
 from subprocess import check_output, STDOUT
 
 
@@ -16,9 +16,9 @@ class PiglitTests:
 
 def run(self):
 piglit_output = ''
- 
+
 log_path = os.path.join(os.environ.get('CHECKBOX_DATA', '.'),
- 'piglit-results', self._name)
+ 'piglit-results', self._name)
 
 run_command = ["piglit-run.py"]
 
@@ -27,14 +27,20 @@ class PiglitTests:
 
 run_command.extend(['/usr/share/piglit/tests/all.tests', log_path])
 
+ piglit_env = dict(os.environ)
+ if os.path.isdir("/usr/share/piglit"):
+ piglit_env['PYTHONPATH'] = "/usr/share/piglit"
+
 piglit_output = check_output(run_command,
 universal_newlines=True,
- stderr=STDOUT)
+ stderr=STDOUT,
+ env=piglit_env)
+
 # TODO: Capture stderr instead?
 for line in piglit_output.split('\n'):
 if ' :: ' in line:
 self._results[line.split(' :: ')[-1].strip()] = \
- line.split(' :: ')[-2].strip()
+ line.split(' :: ')[-2].strip()
 
 def get_tests_by_status(self, status):
 """
@@ -50,8 +56,8 @@ class PiglitTests:
 
 def main():
 parser = ArgumentParser("A wrapper script for the Piglit graphics test "
- "framework which runs the tests and parses the "
- "results.")
+ "framework which runs the tests and parses the "
+ "results.")
 parser.add_argument("--test", "-t",
 required=True,
 action='append',
diff --git a/manage.py b/manage.py
index 01046e6..308d2d2 100755
--- a/manage.py
+++ b/manage.py
@@ -4,7 +4,7 @@ from plainbox.provider_manager import N_
 
 setup(
 name='2013.com.canonical.certification:checkbox',
- version="0.17",
+ version="0.16.1",
 description=N_("Checkbox provider"),
 gettext_domain='2013.com.canonical.certification.checkbox',
 strict=False, deprecated=False,