|
 |
7772e2 |
From ce83aa116397fb71143e5b1363ce7563f7a4444d Mon Sep 17 00:00:00 2001
|
|
|
7772e2 |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
7772e2 |
Date: Mon, 11 Mar 2019 14:56:31 -0400
|
|
|
7772e2 |
Subject: [PATCH] [tests] Test suite fixes for virtualenv and clang
|
|
|
7772e2 |
|
|
|
7772e2 |
- Typo fix - VIRTUAL_ENV in magtests.py
|
|
|
7772e2 |
- testenv object manipulation fix in magtests.py
|
|
|
7772e2 |
- Work around -fstack-clash-protection problems in clang
|
|
|
7772e2 |
|
|
|
7772e2 |
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
|
7772e2 |
(cherry picked from commit 6aa0a5bfe9d60a50cf36c561268c5d7c1fdb2f0e)
|
|
|
7772e2 |
[rharwood@redhat.com: drop Travis goo]
|
|
|
7772e2 |
(cherry picked from commit 11c966cc630393e322ef6b88df91d16247bbfc37)
|
|
|
7772e2 |
---
|
|
|
7772e2 |
tests/magtests.py | 5 ++++-
|
|
|
7772e2 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
7772e2 |
|
|
|
7772e2 |
diff --git a/tests/magtests.py b/tests/magtests.py
|
|
|
7772e2 |
index f14f47a..a4842a0 100755
|
|
|
7772e2 |
--- a/tests/magtests.py
|
|
|
7772e2 |
+++ b/tests/magtests.py
|
|
|
7772e2 |
@@ -687,7 +687,7 @@ if __name__ == '__main__':
|
|
|
7772e2 |
|
|
|
7772e2 |
# support virtualenv
|
|
|
7772e2 |
testenv['PATH'] = os.environ.get('PATH', '')
|
|
|
7772e2 |
- testenv['ViRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
|
|
|
7772e2 |
+ testenv['VIRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
|
|
|
7772e2 |
|
|
|
7772e2 |
testenv['DELEGCCACHE'] = os.path.join(testdir, 'httpd',
|
|
|
7772e2 |
USR_NAME + '@' + TESTREALM)
|
|
|
7772e2 |
@@ -716,6 +716,9 @@ if __name__ == '__main__':
|
|
|
7772e2 |
'MAG_USER_NAME_2': USR_NAME_2,
|
|
|
7772e2 |
'MAG_USER_PASSWORD_2': USR_PWD_2}
|
|
|
7772e2 |
testenv.update(kdcenv)
|
|
|
7772e2 |
+ testenv['PATH'] = os.environ.get('PATH', '')
|
|
|
7772e2 |
+ testenv['VIRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
|
|
|
7772e2 |
+
|
|
|
7772e2 |
errs += test_basic_auth_krb5(testdir, testenv, logfile)
|
|
|
7772e2 |
|
|
|
7772e2 |
errs += test_no_negotiate(testdir, testenv, logfile)
|