Commit 95fa1846 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Skip "tokens" on mac as it hangs on macitois18 (SPI-925)


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20100 4525493e-7705-40b1-a816-d608a930855b
parent 53c7dd46
...@@ -274,11 +274,13 @@ class TextResultStream(FileResultStream): ...@@ -274,11 +274,13 @@ class TextResultStream(FileResultStream):
try: self.file.write( check_output(["klist"],stderr=STDOUT) ) try: self.file.write( check_output(["klist"],stderr=STDOUT) )
except CalledProcessError,e: self.file.write( e.output ) except CalledProcessError,e: self.file.write( e.output )
except OSError,e: self.file.write( "klist failed (" + e.strerror + ")\n" ) except OSError,e: self.file.write( "klist failed (" + e.strerror + ")\n" )
self.file.write("\n") import platform
self._DisplayHeading("ENVIRONMENT: AFS TOKENS") if platform.system() != "Darwin" : # Skip tokens on mac (hangs on macitois18, SPI-925)
try: self.file.write( check_output(["tokens"],stderr=STDOUT) ) self.file.write("\n")
except CalledProcessError,e: self.file.write( e.output ) self._DisplayHeading("ENVIRONMENT: AFS TOKENS")
except OSError,e: self.file.write( "tokens failed (" + e.strerror + ")\n" ) try: self.file.write( check_output(["tokens"],stderr=STDOUT) )
except CalledProcessError,e: self.file.write( e.output )
except OSError,e: self.file.write( "tokens failed (" + e.strerror + ")\n" )
except ImportError, e: except ImportError, e:
pass # subprocess.check_output is missing in python 24 pass # subprocess.check_output is missing in python 24
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment