[Pcsclite-cvs-commit] r4991 - /trunk/PCSC/UnitaryTests/
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Sat Jun 12 21:21:32 UTC 2010
Author: rousseau
Date: Sat Jun 12 21:21:32 2010
New Revision: 4991
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4991
Log:
return exception from smartcard.pcsc.PCSCExceptions when appropriate
Modified:
trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py
trunk/PCSC/UnitaryTests/SCardBlockingBehaviourTest.py
trunk/PCSC/UnitaryTests/SCardCancel.py
trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py
trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py
trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py
trunk/PCSC/UnitaryTests/SCardGetAttrib.py
trunk/PCSC/UnitaryTests/SCardReconnect.py
trunk/PCSC/UnitaryTests/SCard_fork.py
trunk/PCSC/UnitaryTests/ThreadSafe.py
trunk/PCSC/UnitaryTests/ThreadSafeConnect.py
trunk/PCSC/UnitaryTests/reset_card.py
Modified: trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py (original)
+++ trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py Sat Jun 12 21:21:32 2010
@@ -23,32 +23,33 @@
# such a behavior.
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0], SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardBeginTransaction(hcard)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardBeginTransaction: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardBeginTransaction(hcard)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardBeginTransaction: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardDisconnect(hcard, SCARD_RESET_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardReleaseContext(hcontext)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardBlockingBehaviourTest.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardBlockingBehaviourTest.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardBlockingBehaviourTest.py (original)
+++ trunk/PCSC/UnitaryTests/SCardBlockingBehaviourTest.py Sat Jun 12 21:21:32 2010
@@ -36,6 +36,8 @@
import thread
import time
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
+from smartcard.Exceptions import NoReadersException
# Global variable used by test functions to acknowledge
@@ -104,7 +106,7 @@
print "Test thread for %s" % testFunctionName
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
before = time.time()
# Connect in SCARD_SHARE_SHARED mode
@@ -168,14 +170,14 @@
"""docstring for Connect"""
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
if (len(readers) <= 0):
- raise Exception('Reader list is empty, check that a reader is connected')
+ raise NoReadersException()
reader = readers[index]
print "Using reader:", reader
@@ -184,7 +186,7 @@
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
print "SCardConnect failed"
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
return hcontext, hcard, reader
@@ -192,14 +194,14 @@
"""docstring for Connect"""
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
# Connect in SCARD_SHARE_SHARED mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readerName,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
print "SCardConnect failed"
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
return hcontext, hcard
Modified: trunk/PCSC/UnitaryTests/SCardCancel.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardCancel.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardCancel.py (original)
+++ trunk/PCSC/UnitaryTests/SCardCancel.py Sat Jun 12 21:21:32 2010
@@ -19,6 +19,7 @@
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
import threading
import time
@@ -32,11 +33,11 @@
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
readerstates = {}
@@ -44,7 +45,7 @@
readerstates[reader] = (reader, SCARD_STATE_UNAWARE)
hresult, newstates = SCardGetStatusChange(hcontext, 0, readerstates.values())
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardGetStatusChange: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
print newstates
for state in newstates:
readername, eventstate, atr = state
@@ -59,9 +60,9 @@
if SCARD_E_CANCELLED == hresult:
pass
else:
- raise Exception('Failed to SCardGetStatusChange: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardReleaseContext(hcontext)
print "SCardReleaseContext()", SCardGetErrorMessage(hresult)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py (original)
+++ trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py Sat Jun 12 21:21:32 2010
@@ -23,21 +23,22 @@
# such a behavior.
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
# Connect in SCARD_SHARE_SHARED mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
print "dwActiveProtocol:", dwActiveProtocol
@@ -45,7 +46,7 @@
hresult, dwActiveProtocol = SCardReconnect(hcard,
SCARD_SHARE_DIRECT, SCARD_PROTOCOL_ANY, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardReconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
# ActiveProtocol should be SCARD_PROTOCOL_UNDEFINED (0)
print "dwActiveProtocol:", dwActiveProtocol
@@ -54,8 +55,8 @@
hresult = SCardDisconnect(hcard, SCARD_RESET_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardReleaseContext(hcontext)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py (original)
+++ trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py Sat Jun 12 21:21:32 2010
@@ -30,17 +30,18 @@
# bug fixed in revision 4940
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
import sys
SELECT = [0x00, 0xA4, 0x00, 0x00, 0x02, 0x3F, 0x00]
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
print "Using reader:", readers[0]
@@ -49,61 +50,61 @@
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult, response = SCardTransmit(hcard, SCARD_PCI_T1, SELECT)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardTransmit: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
print response
hresult = SCardDisconnect(hcard, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
# Connect in SCARD_SHARE_DIRECT mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_DIRECT, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardDisconnect(hcard, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
# Connect in SCARD_SHARE_SHARED mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult, response = SCardTransmit(hcard, SCARD_PCI_T1, SELECT)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardTransmit: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
print response
# Reconnect in SCARD_SHARE_DIRECT mode
hresult, dwActiveProtocol = SCardReconnect(hcard,
SCARD_SHARE_DIRECT, SCARD_PROTOCOL_ANY, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardReconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardDisconnect(hcard, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
# Connect in SCARD_SHARE_SHARED mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult, response = SCardTransmit(hcard, SCARD_PCI_T1, SELECT)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardTransmit: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
print response
hresult = SCardDisconnect(hcard, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardReleaseContext(hcontext)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py (original)
+++ trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py Sat Jun 12 21:21:32 2010
@@ -36,6 +36,8 @@
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
+from smartcard.Exceptions import NoReadersException
import sys
@@ -43,14 +45,14 @@
""" Connect """
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
if (len(readers) <= 0):
- raise Exception('Reader list is empty, check that a reader is connected')
+ raise NoReadersException()
print "Using reader:", readers[0]
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
@@ -62,7 +64,7 @@
""" ConnectWithReader """
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readerName,
mode, SCARD_PROTOCOL_ANY)
Modified: trunk/PCSC/UnitaryTests/SCardGetAttrib.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardGetAttrib.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardGetAttrib.py (original)
+++ trunk/PCSC/UnitaryTests/SCardGetAttrib.py Sat Jun 12 21:21:32 2010
@@ -22,22 +22,23 @@
# SCARD_ATTR_VENDOR_IFD_SERIAL_NO support has been added in revision 4956
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
import sys
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
for reader in readers:
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_DIRECT, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult, attrib = SCardGetAttrib(hcard, SCARD_ATTR_VENDOR_IFD_SERIAL_NO)
print reader, ":",
@@ -46,8 +47,8 @@
hresult = SCardDisconnect(hcard, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardReleaseContext(hcontext)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardReconnect.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardReconnect.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardReconnect.py (original)
+++ trunk/PCSC/UnitaryTests/SCardReconnect.py Sat Jun 12 21:21:32 2010
@@ -20,15 +20,16 @@
# SCardReconnect() should block instead of returning SCARD_E_SHARING_VIOLATION
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
import sys
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
print "Using reader:", readers[0]
@@ -37,7 +38,7 @@
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
print "Press enter"
sys.stdin.read(1)
@@ -46,13 +47,12 @@
hresult, dwActiveProtocol = SCardReconnect(hcard,
SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardReconnect: ' +
- SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardDisconnect(hcard, SCARD_RESET_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardReleaseContext(hcontext)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCard_fork.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCard_fork.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCard_fork.py (original)
+++ trunk/PCSC/UnitaryTests/SCard_fork.py Sat Jun 12 21:21:32 2010
@@ -19,14 +19,14 @@
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
import time
import os
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' +
- SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
pid = os.fork()
if pid == 0:
@@ -39,8 +39,7 @@
if hresult == SCARD_E_INVALID_HANDLE:
print "test passed"
elif hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' +
- SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
else:
print "test failed"
else:
@@ -52,5 +51,4 @@
hresult = SCardReleaseContext(hcontext)
print "SCardReleaseContext()", SCardGetErrorMessage(hresult)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' +
- SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
Modified: trunk/PCSC/UnitaryTests/ThreadSafe.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/ThreadSafe.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/ThreadSafe.py (original)
+++ trunk/PCSC/UnitaryTests/ThreadSafe.py Sat Jun 12 21:21:32 2010
@@ -22,6 +22,7 @@
from smartcard.scard import (SCardEstablishContext, SCardReleaseContext,
SCardGetErrorMessage, SCARD_SCOPE_USER, SCARD_S_SUCCESS)
+from smartcard.pcsc.PCSCExceptions import *
import threading
MAX_THREADS = 100
@@ -35,14 +36,12 @@
for j in range(1, MAX_ITER):
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: '
- + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult = SCardReleaseContext(hcontext)
#print "SCardReleaseContext()", SCardGetErrorMessage(hresult)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: '
- + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
def main():
"""
Modified: trunk/PCSC/UnitaryTests/ThreadSafeConnect.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/ThreadSafeConnect.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/ThreadSafeConnect.py (original)
+++ trunk/PCSC/UnitaryTests/ThreadSafeConnect.py Sat Jun 12 21:21:32 2010
@@ -25,6 +25,7 @@
SCardListReaders, SCardConnect, SCardDisconnect,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY, SCARD_LEAVE_CARD,
SCardGetErrorMessage, SCARD_SCOPE_USER, SCARD_S_SUCCESS)
+from smartcard.pcsc.PCSCExceptions import *
import threading
MAX_THREADS = 10
@@ -40,36 +41,31 @@
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: '
- + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: '
- + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
for j in range(0, MAX_ITER):
# Connect in SCARD_SHARE_SHARED mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: '
- + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
log = "%d:%d" % (thread, j)
print log,
hresult = SCardDisconnect(hcard, SCARD_LEAVE_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: '
- + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
print
hresult = SCardReleaseContext(hcontext)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: '
- + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
print "Exiting thread:", thread
Modified: trunk/PCSC/UnitaryTests/reset_card.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/reset_card.py?rev=4991&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/reset_card.py (original)
+++ trunk/PCSC/UnitaryTests/reset_card.py Sat Jun 12 21:21:32 2010
@@ -18,15 +18,16 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
from smartcard.scard import *
+from smartcard.pcsc.PCSCExceptions import *
import sys
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+ raise EstablishContextException(hresult)
hresult, readers = SCardListReaders(hcontext, [])
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+ raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
print "Using reader:", readers[0]
@@ -35,7 +36,7 @@
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
if len(sys.argv) > 1:
print "reset using SCardReconnect"
@@ -44,16 +45,15 @@
hresult, dwActiveProtocol = SCardReconnect(hcard,
SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY, SCARD_RESET_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardReconnect: ' +
- SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
else:
print "reset using SCardDisconnect"
# Disconnect after reset
hresult = SCardDisconnect(hcard, SCARD_RESET_CARD)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+ raise BaseSCardException(hresult)
hresult = SCardReleaseContext(hcontext)
if hresult != SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+ raise ReleaseContextException(hresult)
More information about the Pcsclite-cvs-commit
mailing list