Menu
▾
▴
[Pyscard-devel] SF.net SVN: pyscard:[472] trunk/pyscard/src/smartcard/test/framework
|
From: <lu...@us...> - 2010-06-09 15:22:24
|
Revision: 472
http://pyscard.svn.sourceforge.net/pyscard/?rev=472&view=rev
Author: ludov
Date: 2010-06-09 15:22:17 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
make pep8 happy
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py
trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py
Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py 2010-06-09 15:19:46 UTC (rev 471)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py 2010-06-09 15:22:17 UTC (rev 472)
@@ -50,32 +50,35 @@
# a simple card observer that prints inserted/removed cards
-class printobserver( CardObserver ):
- def __init__( self, obsindex, testcase ):
- self.obsindex=obsindex
+class printobserver(CardObserver):
+
+ def __init__(self, obsindex, testcase):
+ self.obsindex = obsindex
self.testcase = testcase
- def update( self, observable, (addedcards, removedcards) ):
- foundcards={}
- self.testcase.assertEquals( removedcards, [] )
+ def update(self, observable, (addedcards, removedcards)):
+ foundcards = {}
+ self.testcase.assertEquals(removedcards, [])
for card in addedcards:
- foundcards[toHexString(card.atr)]=1
+ foundcards[toHexString(card.atr)] = 1
for atr in expectedATRs:
- if []!=atr and {}!=foundcards:
- self.testcase.assert_( foundcards.has_key( toHexString(atr) ) )
+ if [] != atr and {} != foundcards:
+ self.testcase.assert_(foundcards.has_key(toHexString(atr)))
-class testthread( threading.Thread ):
- def __init__(self, obsindex, testcase ):
+
+class testthread(threading.Thread):
+
+ def __init__(self, obsindex, testcase):
threading.Thread.__init__(self)
self.obsindex = obsindex
self.testcase = testcase
self.cardmonitor = CardMonitor()
- self.observer=None
+ self.observer = None
def run(self):
# create and register observer
- self.observer = printobserver( self.obsindex, self.testcase )
- self.cardmonitor.addObserver( self.observer )
+ self.observer = printobserver(self.obsindex, self.testcase)
+ self.cardmonitor.addObserver(self.observer)
time.sleep(1)
self.cardmonitor.deleteObserver(self.observer)
@@ -85,14 +88,15 @@
def testcase_cardmonitorthread(self):
threads = []
- for i in range( 0, 4 ):
- t = testthread( i, self )
- threads.append( t )
+ for i in range(0, 4):
+ t = testthread(i, self)
+ threads.append(t)
for t in threads:
t.start()
for t in threads:
t.join()
+
def suite():
suite1 = unittest.makeSuite(testcase_cardmonitorthread)
return unittest.TestSuite((suite1))
Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py 2010-06-09 15:19:46 UTC (rev 471)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py 2010-06-09 15:22:17 UTC (rev 472)
@@ -58,75 +58,73 @@
"""Test smartcard.AnyCardType."""
for atr in expectedATRs:
- if []!=atr:
- ct = ATRCardType( atr )
- cr=CardRequest( timeout=10, cardType=ct )
+ if [] != atr:
+ ct = ATRCardType(atr)
+ cr = CardRequest(timeout=10, cardType=ct)
cs = cr.waitforcard()
cs.connection.connect()
- self.assertEquals( atr, cs.connection.getATR() )
- self.assertEquals( cs.connection.getReader(), expectedReaderForATR[toHexString(atr)] )
+ self.assertEquals(atr, cs.connection.getATR())
+ self.assertEquals(cs.connection.getReader(), expectedReaderForATR[toHexString(atr)])
cs.connection.disconnect()
def testcase_CardRequestAnyCardTypeInSelectedReader(self):
"""Test smartcard.AnyCardType."""
for reader in expectedReaders:
- atr=expectedATRinReader[reader]
- if []!=atr:
+ atr = expectedATRinReader[reader]
+ if [] != atr:
ct = AnyCardType()
- cr=CardRequest( timeout=10.6, readers=[reader], cardType=ct )
+ cr = CardRequest(timeout=10.6, readers=[reader], cardType=ct)
cs = cr.waitforcard()
cs.connection.connect()
- self.assertEquals( atr, cs.connection.getATR() )
- self.assertEquals( cs.connection.getReader(), expectedReaderForATR[toHexString(atr)] )
+ self.assertEquals(atr, cs.connection.getATR())
+ self.assertEquals(cs.connection.getReader(), expectedReaderForATR[toHexString(atr)])
def testcase_CardRequestATRCardTypeTimeout(self):
"""Test smartcard.AnyCardType."""
for reader in expectedReaders:
- atr=expectedATRinReader[reader][:-1]
- ct = ATRCardType( atr )
- cr=CardRequest( timeout=1, readers=[reader], cardType=ct )
- self.assertRaises( CardRequestTimeoutException, cr.waitforcard )
+ atr = expectedATRinReader[reader][:-1]
+ ct = ATRCardType(atr)
+ cr = CardRequest(timeout=1, readers=[reader], cardType=ct)
+ self.assertRaises(CardRequestTimeoutException, cr.waitforcard)
def testcase_CardRequestATRCardTypeTimeoutAnyReader(self):
"""Test smartcard.AnyCardType."""
readers = smartcard.System.readers()
- atr=expectedATRs[0][:-1]
- ct = ATRCardType( atr )
- cr=CardRequest( timeout=1.5, readers=readers, cardType=ct )
- self.assertRaises( CardRequestTimeoutException, cr.waitforcard )
+ atr = expectedATRs[0][:-1]
+ ct = ATRCardType(atr)
+ cr = CardRequest(timeout=1.5, readers=readers, cardType=ct)
+ self.assertRaises(CardRequestTimeoutException, cr.waitforcard)
-
def testcase_CardRequestAnyCardTypeAnyReaderPassThru(self):
"""Test smartcard.AnyCardType."""
for reader in expectedReaders:
- atr=expectedATRinReader[reader]
- if []!=atr:
+ atr = expectedATRinReader[reader]
+ if [] != atr:
ct = AnyCardType()
cardservice = smartcard.PassThruCardService.PassThruCardService
- cr=CardRequest( timeout=10.6, readers=[reader], cardType=ct, cardServiceClass=cardservice )
+ cr = CardRequest(timeout=10.6, readers=[reader], cardType=ct, cardServiceClass=cardservice)
cs = cr.waitforcard()
cs.connection.connect()
- self.assertEquals( cs.__class__, smartcard.PassThruCardService.PassThruCardService )
- self.assertEquals( atr, cs.connection.getATR() )
- self.assertEquals( cs.connection.getReader(), expectedReaderForATR[toHexString(atr)] )
+ self.assertEquals(cs.__class__, smartcard.PassThruCardService.PassThruCardService)
+ self.assertEquals(atr, cs.connection.getATR())
+ self.assertEquals(cs.connection.getReader(), expectedReaderForATR[toHexString(atr)])
-
def testcase_CardRequestAnyCardTypeInSelectedReaderNewCard(self):
"""Test smartcard.AnyCardType."""
for reader in expectedReaders:
- atr=expectedATRinReader[reader]
+ atr = expectedATRinReader[reader]
ct = AnyCardType()
- cr=CardRequest( newcardonly=True, timeout=1, readers=[reader], cardType=ct )
- self.assertRaises( CardRequestTimeoutException, cr.waitforcard )
+ cr = CardRequest(newcardonly=True, timeout=1, readers=[reader], cardType=ct)
+ self.assertRaises(CardRequestTimeoutException, cr.waitforcard)
def suite():
- suite1 = unittest.makeSuite( testcase_CardRequest )
+ suite1 = unittest.makeSuite(testcase_CardRequest)
return unittest.TestSuite((suite1))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
