Support virtualenv in test suite

Signed-off-by: Robbie Harwood <[email protected]>
Reviewed-by: Simo Sorce <[email protected]>

Author: frozencemetery

tests/magtests.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import argparse
@@ -395,7 +395,6 @@ def setup_keys(tesdir, env):
 
 
 def setup_http(testdir, so_dir, wrapenv):
-
     httpdir = os.path.join(testdir, 'httpd')
     if os.path.exists(httpdir):
         shutil.rmtree(httpdir)
@@ -706,6 +705,10 @@ def test_hostname_acceptor(testdir, testenv, testlog):
         keysenv = setup_keys(testdir, kdcenv)
         testenv = kinit_user(testdir, kdcenv)
 
+        # support virtualenv
+        testenv['PATH'] = os.environ.get('PATH', '')
+        testenv['ViRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
+
         testenv['DELEGCCACHE'] = os.path.join(testdir, 'httpd',
                                               USR_NAME + '@' + TESTREALM)
         test_spnego_auth(testdir, testenv, testlog)

tests/t_bad_acceptor_name.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_basic_k5.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_basic_k5_fail_second.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_basic_k5_two_users.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_basic_proxy.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_hostname_acceptor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2017 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_nonego.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_required_name_attr.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_spnego.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_spnego_negotiate_once.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_spnego_no_auth.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_spnego_proxy.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os

tests/t_spnego_rewrite.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2015 - mod_auth_gssapi contributors, see COPYING for license.
 
 import os