[Pyscard-devel] SF.net SVN: pyscard:[594] trunk/pyscard/src/smartcard/test/scard/ testcase_locatecards.py

[<jda...@us...>]

Revision: 594
          http://pyscard.svn.sourceforge.net/pyscard/?rev=594&view=rev
Author:   jdaussel
Date:     2012-04-08 10:05:33 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
Fixed LocateCards test to support Windows 7 new behaviour

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py	2012-04-08 09:38:10 UTC (rev 593)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py	2012-04-08 10:05:33 UTC (rev 594)
@@ -26,7 +26,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 """
 
-
+import platform
 import unittest
 from smartcard.scard import *
 
@@ -77,23 +77,24 @@
                 self.hcontext, cards, readerstates)
             self.assertEquals(hresult, 0)
 
-            dictexpectedreaders = {}
-            for reader in expectedReaders:
-                dictexpectedreaders[reader] = 1
-            for reader, eventstate, atr in newstates:
-                if reader in dictexpectedreaders and \
-                    [] != expectedATRinReader[reader]:
-                    self.assertEquals(expectedATRinReader[reader], atr)
-                    self.assert_(eventstate & SCARD_STATE_PRESENT)
-                    self.assert_(eventstate & SCARD_STATE_CHANGED)
+            if -1 == platform.platform().find('Windows-7'):
+                dictexpectedreaders = {}
+                for reader in expectedReaders:
+                    dictexpectedreaders[reader] = 1
+                for reader, eventstate, atr in newstates:
+                    if reader in dictexpectedreaders and \
+                        [] != expectedATRinReader[reader]:
+                        self.assertEquals(expectedATRinReader[reader], atr)
+                        self.assert_(eventstate & SCARD_STATE_PRESENT)
+                        self.assert_(eventstate & SCARD_STATE_CHANGED)
 
-            # 10ms delay, so that time-out always occurs
-            hresult, newstates = SCardGetStatusChange(
-                self.hcontext, 10, newstates)
-            self.assertEquals(hresult, SCARD_E_TIMEOUT)
-            self.assertEquals(
-                SCardGetErrorMessage(hresult),
-                'The user-specified timeout value has expired. ')
+                # 10ms delay, so that time-out always occurs
+                hresult, newstates = SCardGetStatusChange(
+                    self.hcontext, 10, newstates)
+                self.assertEquals(hresult, SCARD_E_TIMEOUT)
+                self.assertEquals(
+                    SCardGetErrorMessage(hresult),
+                    'The user-specified timeout value has expired. ')
 
         elif 'pcsclite' == resourceManager:
             readerstates = []

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.