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

[Commits to the Asterisk SCF project code repositories]

branch "review" has been updated
       via  76ec1d6318b084581ee341d71ed1bc747535d7f9 (commit)
       via  5bc4c8eaf0b1ee36698deff873efc93d28a63046 (commit)
      from  0c78d2ab1c21a023ddbb6e334f8231ba5860915d (commit)

Summary of changes:
 Makefile  |    3 +--
 remote.py |    7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 76ec1d6318b084581ee341d71ed1bc747535d7f9
Author: Darren Sessions <dsessions at digium.com>
Date:   Tue Jun 14 11:08:31 2011 -0500

    removed the change dir line from the reset function in the remote script as the reset function is called during the rpc startup process from the main script when the tmp directory doesn't exist. added a restart function so the remotes can be updated and restarted remotely very easily.

diff --git a/remote.py b/remote.py
index 6f8985f..120dce6 100755
--- a/remote.py
+++ b/remote.py
@@ -297,9 +297,14 @@ class RemoteManagement(object):
         return (ipv4addr, ipv6addr)
 
     def reset(self):
-        os.chdir('%s/tmp' % cwd)
         return 1
 
+    def restart(self):
+        initScript = '/etc/init.d/testsuite-remote'
+        if not os.path.exists(initScript) or not os.access(initScript, os.X_OK):
+            return {'success':False, 'msg':'Unable to locate the testsuite-remote init script required to restart. (%s)' % initScript}
+        subprocess.Popen([initScript, 'restart'])
+
     def _argReplace(self, execCmd):
         for arg in execCmd:
             try:

commit 5bc4c8eaf0b1ee36698deff873efc93d28a63046
Author: Darren Sessions <dsessions at digium.com>
Date:   Tue Jun 14 09:29:52 2011 -0500

    Fixed the cp command in the Makefile to be recursive so that everything does indeed get installed where it is supposed to go. duh.

diff --git a/Makefile b/Makefile
index 136e8e7..4ba9b86 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,5 @@ copy:
 	fi
 
 	@for f in *; do \
-		test -f $$f && \
-		cp -p $$f $(INSTALLDIR); \
+		cp -R -p $$f $(INSTALLDIR); \
 	done

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


-- 
asterisk-scf/integration/testsuite.git