Changeset 42

Timestamp:

04/15/08 21:53:17 (4 years ago)

Author:

tim

Message:

DiscardResults? is implemented

Location:

trunk/fpys

Files:

• client.py (modified) (3 diffs)
• tests/client_test.py (modified) (2 diffs)
• tests/wsgi_responder.py (modified) (2 diffs)

trunk/fpys/client.py

@@ -83 +83 @@
 
         for name in ['CallerTokenId', 'SenderTokenId', 'RecipientTokenId', 'TokenId',
-                     'PaymentInstruction', 'AccountId', 'TokenFriendlyName']:
+                     'PaymentInstruction', 'AccountId', 'TokenFriendlyName', 'RequestId']:
             if document.find(name) is not None:
                 attr_name = name[0].lower() + name[1:]
@@ -219 +219 @@
         return self.execute(params)
 
-    def discardResults(self):
+    def discardResults(self, transaction_ids):
+        params = {'Action':  'DiscardResults',
+                  'TransactionIds': transaction_ids}
+        return self.execute(params)
+
+    def getAccountActivity(self):
         pass
 
@@ -390 +395 @@
         return self.execute(params)
 
-    def retryTransaction(self):
-        pass
+    def retryTransaction(self, transaction_id):
+        params = {'Action': 'RetryTransaction',
+                  'OriginalTransactionId': transaction_id}
+        return self.execute(params)
 
     def settle(self,

trunk/fpys/tests/client_test.py

@@ -105 +105 @@
     assert response.success == False
     assert response.errors[0]['errorCode'] == "InvalidParams"
+
+def test_discardResults():
+    """Test DiscardResults"""
+    response = fps_client.discardResults("135AHMQA9H3NEFJL73GQ33873PLPNGLQZP1")
+    assert response.success == True
 
 def test_getPaymentInstruction():
@@ -188 +193 @@
     assert response.transaction.id == "134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC"
 
+# def test_retry():
+#     response = fps_client.retryTransaction("123")
+#     assert response.success == True
+
 def test_settle_over_amount():
     response = fps_client.settle("134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC",

trunk/fpys/tests/wsgi_responder.py

@@ -14 +14 @@
         else:
             response = """<ns0:CancelTokenResponse xmlns:ns0="http://fps.amazonaws.com/doc/2007-01-08/"><Status>Success</Status><RequestId>2a4e67a6-a499-4b3c-b9fa-efd97e117b13:0</RequestId></ns0:CancelTokenResponse>"""
+        return [response]
+
+    def DiscardResults(self, environ):
+        response = """<ns0:DiscardResultsResponse xmlns:ns0="http://fps.amazonaws.com/doc/2007-01-08/"><Status>Success</Status><RequestId>d80fd512-d5c9-4ee0-90fa-f2af1ac837a2:0</RequestId></ns0:DiscardResultsResponse>"""
         return [response]
 
@@ -79 +83 @@
         return [response]
 
+    def RetryTransaction(self, environ):
+        response = """ """
+        return [response]
+
     def Settle(self, environ):
         if environ['fps.params']['TransactionAmount.Amount'][0] == "100.00":