[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue May 24 16:28:56 CDT 2011


branch "review" has been updated
       via  8dba004df47f752be774a611213eef53dffab065 (commit)
      from  5cf310bf212060d28874807ce2374e8df99d71c6 (commit)

Summary of changes:
 plugins/build.py |    4 ++++
 remote.py        |    7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 8dba004df47f752be774a611213eef53dffab065
Author: Darren Sessions <dsessions at digium.com>
Date:   Tue May 24 16:28:53 2011 -0500

    tweaks to the build plugin

diff --git a/plugins/build.py b/plugins/build.py
index 98377f6..39e37a2 100644
--- a/plugins/build.py
+++ b/plugins/build.py
@@ -72,6 +72,10 @@ class testsuite(util.TestSuiteRemoteBaseClass):
                     results = rpc.getFileFromRemote(remote, 'tmp.tar.gz')
                     if results['success'] == False:
                         return results
+
+                results = rpc.removeFile('tmp.tar.gz')
+                if results['success'] == False:
+                    return results
         
         return {'success':True,'shutdownExempt':True}
 
diff --git a/remote.py b/remote.py
index 81ef27e..7b827ea 100755
--- a/remote.py
+++ b/remote.py
@@ -16,6 +16,7 @@ import os
 import time
 import shutil
 import platform
+import xmlrpclib
 import subprocess
 import SimpleXMLRPCServer
 
@@ -197,14 +198,14 @@ class RemoteManagement(object):
         f.close()
         return {'success':True}
 
-    def sendFileToRemote(self, fn):
+    def sendFileToRemote(self, fn, data):
         with open('%s/tmp/%s' % (cwd, fn), "wb") as fh:
-            fh.write(rpc.sendFileToRemote().data)
+            fh.write(data)
 
     def getFileFromRemote(self, remote, fn):
         rpc = xmlrpclib.ServerProxy('http://%s:8000/' % remote)
         with open('%s/tmp/%s' % (cwd, fn), "rb") as fh:
-            return xmlrpclib.Binary(fh.read())
+            rpc.sendFileToRemote(fn, xmlrpclib.Binary(fh.read()).data)
 
     def reset(self):
         os.chdir('%s/tmp' % cwd)

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/testsuite.git



More information about the asterisk-scf-commits mailing list