krb5 commit: Fix skip logic in t_otp.py

Greg Hudson ghudson at MIT.EDU
Thu Jul 11 19:44:36 EDT 2013


https://github.com/krb5/krb5/commit/f6cb089daed2615d0b1594d7ccc20d617eb374eb
commit f6cb089daed2615d0b1594d7ccc20d617eb374eb
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Jul 11 19:44:11 2013 -0400

    Fix skip logic in t_otp.py
    
    Reorder (and trim) the imports in t_otp.py so that k5test is pulled in
    before we try to import pyrad and multiprocessing.  Otherwise
    success() isn't defined in the case where we decide to skip the entire
    test script.

 src/tests/t_otp.py |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/tests/t_otp.py b/src/tests/t_otp.py
index 66a03ee..0aeb692 100644
--- a/src/tests/t_otp.py
+++ b/src/tests/t_otp.py
@@ -30,14 +30,10 @@
 # test how OTP handles the case of short daemon restarts.
 #
 
+from k5test import *
 from Queue import Empty
 import StringIO
 import struct
-import subprocess
-import sys
-import socket
-import os
-import atexit
 
 try:
     from pyrad import packet, dictionary
@@ -46,8 +42,6 @@ except ImportError:
     success('Warning: skipping OTP tests due to missing pyrad or old Python')
     exit(0)
 
-from k5test import *
-
 class RadiusDaemon(Process):
     MAX_PACKET_SIZE = 4096
 


More information about the cvs-krb5 mailing list