SF.net SVN: fclient: [418] trunk/sandbox/fcp2/test_fcp/test_client.py
Status: Pre-Alpha
Brought to you by:
jurner
|
From: <jU...@us...> - 2008-06-29 10:59:22
|
Revision: 418
http://fclient.svn.sourceforge.net/fclient/?rev=418&view=rev
Author: jUrner
Date: 2008-06-29 03:59:31 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
adapt to recent changes
Modified Paths:
--------------
trunk/sandbox/fcp2/test_fcp/test_client.py
Modified: trunk/sandbox/fcp2/test_fcp/test_client.py
===================================================================
--- trunk/sandbox/fcp2/test_fcp/test_client.py 2008-06-29 10:59:13 UTC (rev 417)
+++ trunk/sandbox/fcp2/test_fcp/test_client.py 2008-06-29 10:59:31 UTC (rev 418)
@@ -196,7 +196,6 @@
self.assertEqual(value1, msg[param1])
if param2 is not None:
param2, value2 = param2
- self.failUnless(param2 in msg.params)
self.assertEqual(value2, msg[param2])
if param3 is not None:
param3, value3 = param3
@@ -879,28 +878,23 @@
def test_100_request_registered(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey)
requestsAll = self.client.getRequests()
self.failUnless(myIdentifier in requestsAll)
myRequest = self.client.getRequest(myIdentifier)
self.assertEqual(myRequest['RequestType'], self.client.consts.RequestType.GetData)
- def test_200_key_object_is_accepted(self):
- self.connectClient()
- key = self.client.key.CHK()
- myIdentifier = self.client.getData(key)
- requestsAll = self.client.getRequests()
-
-
def test_300_message_send(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey)
requestsAll = self.client.getRequests()
self.assertHasNextMessage(
'ClientGet',
- ('URI', 'arbitrary-key'),
+ ('URI', myKey),
)
self.assertHasNextEvent(None)
@@ -911,7 +905,8 @@
def test_400_progress(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey)
requestsAll = self.client.getRequests()
self.assertHasNextMessage('ClientGet')
@@ -938,7 +933,8 @@
def test_500_completed_successfuly(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey)
requestsAll = self.client.getRequests()
self.assertHasNextMessage('ClientGet')
@@ -984,7 +980,8 @@
def test_600_completed_with_error(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey)
requestsAll = self.client.getRequests()
self.assertHasNextMessage('ClientGet')
@@ -1015,7 +1012,8 @@
def test_700_peristent_request_auto_retrieve_data(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key', persistence=self.client.consts.Persistence.Forever)
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey, persistence=self.client.consts.Persistence.Forever)
requestsAll = self.client.getRequests()
self.assertHasNextMessage('ClientGet')
@@ -1042,7 +1040,8 @@
def test_800_peristent_request_not_removed_on_success(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key', persistence=self.client.consts.Persistence.Forever)
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey, persistence=self.client.consts.Persistence.Forever)
requestsAll = self.client.getRequests()
self.assertHasNextMessage('ClientGet')
@@ -1067,7 +1066,8 @@
def test_900_peristent_request_not_removed_on_error(self):
self.connectClient()
- myIdentifier = self.client.getData('arbitrary-key', persistence=self.client.consts.Persistence.Forever)
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey, persistence=self.client.consts.Persistence.Forever)
requestsAll = self.client.getRequests()
self.assertHasNextMessage('ClientGet')
@@ -1107,7 +1107,8 @@
def test_920_restore_peristent_request_success(self):
self.connectClient()
requestsAll = self.client.getRequests()
- myIdentifier = self.client.getData('arbitrary-key', persistence=self.client.consts.Persistence.Forever)
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getData(myKey, persistence=self.client.consts.Persistence.Forever)
self.failUnless(myIdentifier in requestsAll)
myRequest = self.client.getRequest(myIdentifier)
del requestsAll[myIdentifier]
@@ -1134,7 +1135,8 @@
def test_100_request_registered(self):
self.connectClient()
- myIdentifier = self.client.getFile('arbitrary-key', 'foo.txt')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getFile(myKey, 'foo.txt')
requestsAll = self.client.getRequests()
self.failUnless(myIdentifier in requestsAll)
myRequest = self.client.getRequest(myIdentifier)
@@ -1143,17 +1145,16 @@
def test_200_key_object_is_accepted(self):
self.connectClient()
- key = self.client.key.CHK()
-
- myIdentifier = self.client.getFile(key, 'foo.txt')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getFile(myKey, 'foo.txt')
requestsAll = self.client.getRequests()
def test_300_dda_denied(self):
self.connectClient()
-
+ myKey = self.client.key.key('KSK@foo')
myIdentifier = self.client.getFile(
- 'arbitrary-uri',
+ myKey,
os.path.join(DIR, 'DDATest.txt')
)
myRequest = self.client.getRequest(myIdentifier)
@@ -1235,7 +1236,8 @@
def test_100_request_registered(self):
self.connectClient()
- myIdentifier = self.client.getKeyInfo('arbitrary-key')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getKeyInfo(myKey)
requestsAll = self.client.getRequests()
self.failUnless(myIdentifier in requestsAll)
myRequest = self.client.getRequest(myIdentifier)
@@ -1243,15 +1245,16 @@
def test_200_key_object_is_accepted(self):
self.connectClient()
- key = self.client.key.CHK()
+ myKey = self.client.key.key('KSK@foo')
- myIdentifier = self.client.getKeyInfo(key)
+ myIdentifier = self.client.getKeyInfo(myKey)
requestsAll = self.client.getRequests()
def test_300_getKeyInfo_Success(self):
self.connectClient()
- myIdentifier = self.client.getKeyInfo('arbitrary-uri')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getKeyInfo(myKey)
myRequest = self.client.getRequest(myIdentifier)
requestsAll = self.client.getRequests()
@@ -1287,7 +1290,8 @@
# test specdial case where ProtocolError.TooBig is handled as success
# request a arbitrary uri
- myIdentifier = self.client.getKeyInfo('arbitrary-uri')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getKeyInfo(myKey)
myRequest = self.client.getRequest(myIdentifier)
requestsAll = self.client.getRequests()
@@ -1317,7 +1321,8 @@
self.connectClient()
# request a arbitrary file
- myIdentifier = self.client.getKeyInfo('arbitrary-uri')
+ myKey = self.client.key.key('KSK@foo')
+ myIdentifier = self.client.getKeyInfo(myKey)
myRequest = self.client.getRequest(myIdentifier)
requestsAll = self.client.getRequests()
@@ -1350,15 +1355,15 @@
def test_100_subscribeUSK_accepts_key_object(self):
self.connectClient()
- key = self.client.key.USK('123456789', 'foo', 0)
+ key = self.client.key.USK(client.key.DummyKeyData, 'foo', 0)
myIdentifier = self.client.subscribeUSK(key)
self.assertHasNextMessage(
'SubscribeUSK',
- ('URI', key.toString()),
+ ('URI', key),
)
- def test_200_subscribeUSK(self):
+ def XXXtest_200_subscribeUSK(self):
self.connectClient()
myIdentifier = self.client.subscribeUSK('arbitrary-key')
myRequest = self.client.getRequest(myIdentifier)
@@ -3326,11 +3331,10 @@
def test_11000_Subscribe(self):
-
myIdentifier = self.client.subscribeUSK('arbitrary')
myRequest = self.client.getRequest(myIdentifier)
requestsAll = self.client.getRequests()
-
+
self.failUnless(myIdentifier in requestsAll)
self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|