[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  01ed224b6be145438928408584089d5442350da1 (commit)
      from  7c4246acad7850e013ae80258789981efd5c1d34 (commit)

Summary of changes:
 remote.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 01ed224b6be145438928408584089d5442350da1
Author: Darren Sessions <dsessions at digium.com>
Date:   Tue Jun 7 10:34:17 2011 -0500

    Throughout the code there are various path checks. I added the function name to those result messages to make issue more easily identifiable.

diff --git a/remote.py b/remote.py
index fdad674..771e943 100755
--- a/remote.py
+++ b/remote.py
@@ -59,8 +59,8 @@ class RemoteManagement(object):
 
         if not os.path.exists('%s/tmp/artifacts/%s' % (cwd, globalVars['testInfo']['testPath'])):
             os.makedirs('%s/tmp/artifacts/%s' % (cwd, globalVars['testInfo']['testCategory']))
-            os.makedirs('%s/tmp/artifacts/%s/%s' % (cwd, globalVars['testInfo']['testCategory'], self.globalVars['testInfo']['testCase']))
-            os.makedirs('%s/tmp/artifacts/%s/%s/%s' % (cwd, globalVars['testInfo']['testCategory'], self.globalVars['testInfo']['testCase'], self.globalVars['testInfo']['testName']))
+            os.makedirs('%s/tmp/artifacts/%s/%s' % (cwd, globalVars['testInfo']['testCategory'], globalVars['testInfo']['testCase']))
+            os.makedirs('%s/tmp/artifacts/%s/%s/%s' % (cwd, globalVars['testInfo']['testCategory'], globalVars['testInfo']['testCase'], globalVars['testInfo']['testName']))
             if not os.path.exists('%s/tmp/artifacts/%s' % (cwd, globalVars['testInfo']['testPath'])):
                 return {'success':False,'msg':'Unable to create artifact test path on remotes. %s' % globalVars['testInfo']['testPath']}
 
@@ -152,7 +152,7 @@ class RemoteManagement(object):
     def changeDir(self, dir):
         dir = self._filePathCheck(dir)
         if not os.path.exists('%s/tmp/%s' % (cwd, dir)):
-            return {'success':False,'msg':'The %s path does not exist.' % dir}
+            return {'success':False,'msg':'changeDir: The %s path does not exist.' % dir}
         os.chdir('%s/tmp/%s' % (cwd, dir))
         return {'success':True,'cwd':os.getcwd()}
 
@@ -160,7 +160,7 @@ class RemoteManagement(object):
         dir = self._filePathCheck(dir)
         dir = dir.replace('/', '/invalid')
         if not os.path.exists('%s/tmp/%s' % (cwd, dir)):
-            return {'success':False,'msg':'The %s path does not exist.' % dir}
+            return {'success':False,'msg':'removeDir: The %s path does not exist.' % dir}
         shutil.rmtree('%s/tmp/%s' % (cwd, dir))
         return {'success':True}
 
@@ -168,9 +168,9 @@ class RemoteManagement(object):
         fp = self._filePathCheck(fp)
         dp = self._filePathCheck(dp)
         if not os.path.exists('%s/tmp/build/%s' % (cwd, fp)):
-            return {'success':False,'msg':'The %s path does not exist.' % fp} 
+            return {'success':False,'msg':'moveFile: The %s source path does not exist.' % fp} 
         if not os.path.exists('%s/tmp/build/%s' % (cwd, dp)):
-            return {'success':False,'msg':'The %s path does not exist.' % dp}
+            return {'success':False,'msg':'moveFile: The %s destination path does not exist.' % dp}
         try:
             returncode = subprocess.call('mv %s/tmp/build/%s %s/tmp/build/%s' % (cwd, fp, cwd, dp))
             if returncode != 0:
@@ -189,7 +189,7 @@ class RemoteManagement(object):
     def archiveDir(self, globalVars, dn):
         dn = self._filePathCheck(dn)
         if not os.path.exists("%s" % dn):
-            return {'success':False,'msg':'The %s path does not exist.' % dn}
+            return {'success':False,'msg':'archiveDir: The %s path does not exist.' % dn}
         os.chdir('%s/tmp' % cwd)
         results = self.run(globalVars, 'remote', 'archiveDir', [self._which('tar'), '-cvf', 'tmp.tar', '%s' % dn], True)
         if results['success'] == False:

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


-- 
asterisk-scf/integration/testsuite.git