From 7fa3d5a509cc14040edc03286f4bec837c08dd4e Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 23 Dec 2009 22:51:07 +0100
Subject: [PATCH] Update how to install test dependencies

---
 README.rst            | 8 ++++++--
 test-requirements.txt | 1 -
 tests/__main__.py     | 7 ++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 5a9c38e0..bfedfd24 100644
--- a/README.rst
+++ b/README.rst
@@ -96,9 +96,13 @@ To stop mopidy, press ``CTRL+C``.
 Running tests
 -------------
 
-To run tests, you need a couple of dependiencies which can be installed using
-pip::
+To run tests, you need a couple of dependiencies. Some can be installed through Debian/Ubuntu package management::
 
+    sudo aptitude install python-coverage
+
+The rest can be installed using pip::
+
+    sudo aptitude install python-pip python-setuptools bzr
     pip install -r test-requirements.txt
 
 Then, to run all tests::
diff --git a/test-requirements.txt b/test-requirements.txt
index 0342fb1c..459f434a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1 @@
-coverage
 -e bzr+http://liw.iki.fi/bzr/coverage-test-runner/trunk/#egg=CoverageTestRunner
diff --git a/tests/__main__.py b/tests/__main__.py
index ecf863bb..cebef95a 100644
--- a/tests/__main__.py
+++ b/tests/__main__.py
@@ -1,14 +1,11 @@
-#! /usr/bin/env python
-
 import os
 import sys
 
 from CoverageTestRunner import CoverageTestRunner
 
-sys.path.insert(0,
-    os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
-
 def main():
+    sys.path.insert(0,
+        os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
     r = CoverageTestRunner()
     r.add_pair('mopidy/handler.py', 'tests/handlertest.py')
     r.run()