The Python interpreter used to run the test cases is hard-coded to be
/usr/bin/python. If we use the first one from $PATH instead, it is
much easier to test ganeti with other Python versions.

---
 DEVNOTES                               |    9 +++++++++
 test/ganeti.bdev_unittest.py           |    2 +-
 test/ganeti.cli_unittest.py            |    2 +-
 test/ganeti.cmdlib_unittest.py         |    2 +-
 test/ganeti.config_unittest.py         |    2 +-
 test/ganeti.constants_unittest.py      |    2 +-
 test/ganeti.hooks_unittest.py          |    2 +-
 test/ganeti.http_unittest.py           |    2 +-
 test/ganeti.locking_unittest.py        |    2 +-
 test/ganeti.rapi.resources_unittest.py |    2 +-
 test/ganeti.serializer_unittest.py     |    2 +-
 test/ganeti.ssh_unittest.py            |    2 +-
 test/ganeti.utils_unittest.py          |    2 +-
 test/ganeti.workerpool_unittest.py     |    2 +-
 14 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/DEVNOTES b/DEVNOTES
index b4146c4..21c4269 100644
--- a/DEVNOTES
+++ b/DEVNOTES
@@ -19,3 +19,12 @@ Configuring for development
 sh autogen.sh && \
 ./configure PYTHON=python2.4 --enable-maintainer-mode \
   --prefix=/usr/local --sysconfdir=/etc --localstatedir=/var
+
+
+Running test suite
+------------------
+The usual 'make check' run the tests using the first Python interpreter
+found in your path. If you want to use another Python interpreter, do
+something like this:
+
+  $ env PATH=/your/python/dir/bin:$PATH make check
diff --git a/test/ganeti.bdev_unittest.py b/test/ganeti.bdev_unittest.py
index 2db785c..41666b1 100755
--- a/test/ganeti.bdev_unittest.py
+++ b/test/ganeti.bdev_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007 Google Inc.
diff --git a/test/ganeti.cli_unittest.py b/test/ganeti.cli_unittest.py
index 29734ae..a16cd86 100755
--- a/test/ganeti.cli_unittest.py
+++ b/test/ganeti.cli_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2008 Google Inc.
diff --git a/test/ganeti.cmdlib_unittest.py b/test/ganeti.cmdlib_unittest.py
index 2955b3d..99c2d87 100755
--- a/test/ganeti.cmdlib_unittest.py
+++ b/test/ganeti.cmdlib_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2008 Google Inc.
diff --git a/test/ganeti.config_unittest.py b/test/ganeti.config_unittest.py
index 24c9491..556d79a 100755
--- a/test/ganeti.config_unittest.py
+++ b/test/ganeti.config_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007 Google Inc.
diff --git a/test/ganeti.constants_unittest.py
b/test/ganeti.constants_unittest.py
index 7652f86..75a8131 100755
--- a/test/ganeti.constants_unittest.py
+++ b/test/ganeti.constants_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007, 2008 Google Inc.
diff --git a/test/ganeti.hooks_unittest.py b/test/ganeti.hooks_unittest.py
index 55fef19..96d62c4 100755
--- a/test/ganeti.hooks_unittest.py
+++ b/test/ganeti.hooks_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007 Google Inc.
diff --git a/test/ganeti.http_unittest.py b/test/ganeti.http_unittest.py
index 1394f3d..7c18afb 100755
--- a/test/ganeti.http_unittest.py
+++ b/test/ganeti.http_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2007, 2008 Google Inc.
diff --git a/test/ganeti.locking_unittest.py b/test/ganeti.locking_unittest.py
index aee6860..09bec43 100755
--- a/test/ganeti.locking_unittest.py
+++ b/test/ganeti.locking_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007 Google Inc.
diff --git a/test/ganeti.rapi.resources_unittest.py
b/test/ganeti.rapi.resources_unittest.py
index 11d3450..3ac02a7 100755
--- a/test/ganeti.rapi.resources_unittest.py
+++ b/test/ganeti.rapi.resources_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2007, 2008 Google Inc.
diff --git a/test/ganeti.serializer_unittest.py
b/test/ganeti.serializer_unittest.py
index 08aad67..69059cc 100755
--- a/test/ganeti.serializer_unittest.py
+++ b/test/ganeti.serializer_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007, 2008 Google Inc.
diff --git a/test/ganeti.ssh_unittest.py b/test/ganeti.ssh_unittest.py
index d999929..11e91ad 100755
--- a/test/ganeti.ssh_unittest.py
+++ b/test/ganeti.ssh_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007, 2008 Google Inc.
diff --git a/test/ganeti.utils_unittest.py b/test/ganeti.utils_unittest.py
index 1c2992c..dbebec8 100755
--- a/test/ganeti.utils_unittest.py
+++ b/test/ganeti.utils_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2006, 2007 Google Inc.
diff --git a/test/ganeti.workerpool_unittest.py
b/test/ganeti.workerpool_unittest.py
index bee3824..b7af61f 100755
--- a/test/ganeti.workerpool_unittest.py
+++ b/test/ganeti.workerpool_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #

 # Copyright (C) 2008 Google Inc.
-- 
1.6.0.2

Reply via email to