[Pcsclite-cvs-commit] r5091 - in /trunk/PCSC/UnitaryTests: SCardBeginTransaction_Disconnect.py SCardConnect_DIRECT.py SCardConnect_DIRECT2.py SCardExclusiveBehaviour.py SCardReconnect.py reset_card.py
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Mon Aug 2 06:54:30 UTC 2010
Author: rousseau
Date: Mon Aug 2 06:54:19 2010
New Revision: 5091
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5091
Log:
Do not duplicate the reader index to avoids problems when I want to
change it.
Modified:
trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py
trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py
trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py
trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py
trunk/PCSC/UnitaryTests/SCardReconnect.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=5091&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py (original)
+++ trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py Mon Aug 2 06:54:19 2010
@@ -33,8 +33,10 @@
if hresult != SCARD_S_SUCCESS:
raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
+reader = readers[0]
+print "Using reader:", reader
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0], SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py?rev=5091&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py (original)
+++ trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py Mon Aug 2 06:54:19 2010
@@ -33,9 +33,11 @@
if hresult != SCARD_S_SUCCESS:
raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
+reader = readers[0]
+print "Using reader:", reader
# Connect in SCARD_SHARE_SHARED mode
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py?rev=5091&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py (original)
+++ trunk/PCSC/UnitaryTests/SCardConnect_DIRECT2.py Mon Aug 2 06:54:19 2010
@@ -44,10 +44,11 @@
raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
-print "Using reader:", readers[0]
+reader = readers[0]
+print "Using reader:", reader
# Connect in SCARD_SHARE_SHARED mode
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
@@ -62,7 +63,7 @@
raise BaseSCardException(hresult)
# Connect in SCARD_SHARE_DIRECT mode
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_DIRECT, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
@@ -72,7 +73,7 @@
raise BaseSCardException(hresult)
# Connect in SCARD_SHARE_SHARED mode
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
@@ -92,7 +93,7 @@
raise BaseSCardException(hresult)
# Connect in SCARD_SHARE_SHARED mode
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
Modified: trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py?rev=5091&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py (original)
+++ trunk/PCSC/UnitaryTests/SCardExclusiveBehaviour.py Mon Aug 2 06:54:19 2010
@@ -53,11 +53,12 @@
print 'PC/SC Readers:', readers
if (len(readers) <= 0):
raise NoReadersException()
- print "Using reader:", readers[0]
+ reader = readers[0]
+ print "Using reader:", reader
- hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+ hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
mode, SCARD_PROTOCOL_ANY)
- return hresult, hcontext, hcard, readers[0]
+ return hresult, hcontext, hcard, reader
def ConnectWithReader(readerName, mode):
Modified: trunk/PCSC/UnitaryTests/SCardReconnect.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardReconnect.py?rev=5091&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardReconnect.py (original)
+++ trunk/PCSC/UnitaryTests/SCardReconnect.py Mon Aug 2 06:54:19 2010
@@ -32,10 +32,11 @@
raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
-print "Using reader:", readers[0]
+reader = readers[0]
+print "Using reader:", reader
# Connect in SCARD_SHARE_SHARED mode
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
Modified: trunk/PCSC/UnitaryTests/reset_card.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/reset_card.py?rev=5091&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/reset_card.py (original)
+++ trunk/PCSC/UnitaryTests/reset_card.py Mon Aug 2 06:54:19 2010
@@ -30,10 +30,11 @@
raise ListReadersException(hresult)
print 'PC/SC Readers:', readers
-print "Using reader:", readers[0]
+reader = readers[0]
+print "Using reader:", reader
# Connect in SCARD_SHARE_SHARED mode
-hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
+hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, reader,
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
if hresult != SCARD_S_SUCCESS:
raise BaseSCardException(hresult)
More information about the Pcsclite-cvs-commit
mailing list