[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
Mon May 23 15:44:46 CDT 2011
branch "review" has been updated
via 087a974c411d3a71e8d8c43b44362bdf557b9018 (commit)
via 0e3e9106a5a07ac3a9353fc2aa4c927c8f1773a3 (commit)
from b9f5aeefa5257a374cfabe8911eba744305ac8b6 (commit)
Summary of changes:
lib/python/util.py | 2 -
lib/python/yaml_parser.py | 1 -
plugins/build.py | 35 ++++++++++++--------
remote.py | 2 +-
tests/build/Build_AsteriskSCF/testcase.yaml | 48 +++++++++++++++++++++++++++
tests/build/tests.yaml | 2 +
tests/tests.yaml | 2 +-
testsuite.py | 2 -
8 files changed, 73 insertions(+), 21 deletions(-)
create mode 100644 tests/build/Build_AsteriskSCF/testcase.yaml
create mode 100644 tests/build/tests.yaml
- Log -----------------------------------------------------------------
commit 087a974c411d3a71e8d8c43b44362bdf557b9018
Author: Darren Sessions <dsessions at digium.com>
Date: Mon May 23 15:44:43 2011 -0500
tweaks to the build plugin
diff --git a/lib/python/util.py b/lib/python/util.py
index 28be839..f0debb5 100644
--- a/lib/python/util.py
+++ b/lib/python/util.py
@@ -35,8 +35,6 @@ class TestSuiteRemoteBaseClass:
if not 'testsuite_remote' in testData:
return {'success':False,'msg':'No testsuite remote specified.'}
rpc = xmlrpclib.Server('http://%s:8000' % testData['testsuite_remote'])
-
- rpc.testRPC()
try:
rpc.testRPC()
except:
diff --git a/lib/python/yaml_parser.py b/lib/python/yaml_parser.py
index eb15160..c15662f 100755
--- a/lib/python/yaml_parser.py
+++ b/lib/python/yaml_parser.py
@@ -2,7 +2,6 @@
import sys
import yaml
-import dumper
class yamlBase:
def __init__(self):
diff --git a/plugins/build.py b/plugins/build.py
index 5974563..7df9c11 100644
--- a/plugins/build.py
+++ b/plugins/build.py
@@ -13,28 +13,35 @@ import util
class testsuite(util.TestSuiteRemoteBaseClass):
def main(self, testData, testPath, rpc):
- return {'success':True,'shutdownExempt':'True'}
-
- ''' start and stop individual components. shutdown is implemented in the main testsuite code '''
- if not 'git_repo' in testData['cmd'] and not 'svn_repo' in testData['cmd']:
+ if not 'repo' in testData['cmd']:
return {'success':False,'msg':'No repo specified.'}
- else:
- if 'git_repo' in testData['cmd']:
- repoType = 'git'
- repo = testData['cmd']['git_repo']
- elif 'svn_repo' in testData['cmd']:
- repoType = 'svn'
- repo = testData['cmd']['svn_repo']
-
- results = util.url().fetchRepoName(repo)
+
+ results = util.url().fetchRepoName(testData['cmd']['repo'])
if results['success'] == False:
return results
else:
repoName = results['repoName']
- print results
print repoName
+
+ results = rpc.changeDir('tmp')
+ if results['success'] == False:
+ return results
+
+
+# if 'git_repo' in testData['cmd']:
+# repoType = 'git'
+# results = rpc.run('build', repoName, ['git','clone', '%s' % testData['cmd']['git_repo']])
+#
+# elif 'svn_repo' in testData['cmd']:
+# repoType = 'svn'
+# repo = testData['cmd']['svn_repo']
+
+# print results
+# print repoName
+
+
'''
for cmd in testData['cmd']:
diff --git a/remote.py b/remote.py
index ed950b1..785dd76 100755
--- a/remote.py
+++ b/remote.py
@@ -140,7 +140,7 @@ class RemoteManagement(object):
return {'success':True}
- def cd(self, dir):
+ def changeDir(self, dir):
if not os.path.exists('%s/tmp/%s' % (cwd, dir)):
return {'success':False,'msg':'The %s path does not exist.'}
os.chdir('%s/tmp/%s' % (cwd, dir))
diff --git a/tests/build/Build_AsteriskSCF/testcase.yaml b/tests/build/Build_AsteriskSCF/testcase.yaml
index 18b22ea..40d03a2 100644
--- a/tests/build/Build_AsteriskSCF/testcase.yaml
+++ b/tests/build/Build_AsteriskSCF/testcase.yaml
@@ -6,7 +6,7 @@ tests :
testsuite_remote : testsuite-server.digium.internal
cmd :
pull_update : True
- git_repo : 'git://git.asterisk.org/asterisk-scf/release/ice'
+ repo : 'git://git.asterisk.org/asterisk-scf/release/ice'
cd : ice/cpp
make_cmd :
- make
@@ -17,7 +17,7 @@ tests :
testsuite_remote : testsuite-server.digium.internal
cmd :
pull_update : True
- git_repo : 'git://git.asterisk.org/asterisk-scf/release/ice'
+ repo : 'git://git.asterisk.org/asterisk-scf/release/ice'
cd : ice/py
make_cmd :
- make
@@ -28,7 +28,7 @@ tests :
testsuite_remote : testsuite-server.digium.internal
cmd :
pull_update : True
- git_repo : git.asterisk.org/asterisk-scf/release/slice-plugins
+ repo : 'git://git.asterisk.org/asterisk-scf/release/slice-plugins'
cd : slice-plugins
make_cmd :
- cmake .
@@ -40,7 +40,7 @@ tests :
testsuite_remote : testsuite-server.digium.internal
cmd :
pull_update : True
- git_repo : git.asterisk.org/asterisk-scf/release/gitall
+ repo : 'git://git.asterisk.org/asterisk-scf/release/gitall'
cd : gitall
make_cmd :
- ./gitall-asterisk-scf.sh
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 6e94f4c..4d4d45e 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,3 +1,3 @@
tests :
- build
- - sip
+# - sip
diff --git a/testsuite.py b/testsuite.py
index f939693..21c3f1d 100755
--- a/testsuite.py
+++ b/testsuite.py
@@ -22,8 +22,6 @@ sys.path.append("%s/plugins" % homeDir)
import util
import yaml_parser
-import dumper
-
class __main__:
def __init__(self):
self.yamlData = yaml_parser.testcases().returnData
commit 0e3e9106a5a07ac3a9353fc2aa4c927c8f1773a3
Author: Darren Sessions <dsessions at digium.com>
Date: Mon May 23 15:02:32 2011 -0500
added the build plugin tests.yaml and the scf build testcase.yaml
diff --git a/tests/build/Build_AsteriskSCF/testcase.yaml b/tests/build/Build_AsteriskSCF/testcase.yaml
new file mode 100644
index 0000000..18b22ea
--- /dev/null
+++ b/tests/build/Build_AsteriskSCF/testcase.yaml
@@ -0,0 +1,48 @@
+name : Build_AsteriskSCF
+tests :
+ - ice_cpp :
+ timeline :
+ - build :
+ testsuite_remote : testsuite-server.digium.internal
+ cmd :
+ pull_update : True
+ git_repo : 'git://git.asterisk.org/asterisk-scf/release/ice'
+ cd : ice/cpp
+ make_cmd :
+ - make
+ - make install
+ - ice_python :
+ timeline :
+ - build :
+ testsuite_remote : testsuite-server.digium.internal
+ cmd :
+ pull_update : True
+ git_repo : 'git://git.asterisk.org/asterisk-scf/release/ice'
+ cd : ice/py
+ make_cmd :
+ - make
+ - make install
+ - slice_plugins :
+ timeline:
+ - build :
+ testsuite_remote : testsuite-server.digium.internal
+ cmd :
+ pull_update : True
+ git_repo : git.asterisk.org/asterisk-scf/release/slice-plugins
+ cd : slice-plugins
+ make_cmd :
+ - cmake .
+ - make
+ - make install
+ - asterisk_scf :
+ timeline:
+ - build :
+ testsuite_remote : testsuite-server.digium.internal
+ cmd :
+ pull_update : True
+ git_repo : git.asterisk.org/asterisk-scf/release/gitall
+ cd : gitall
+ make_cmd :
+ - ./gitall-asterisk-scf.sh
+ - cmake/init-cmake.sh
+ - cmake --build ./build
diff --git a/tests/build/tests.yaml b/tests/build/tests.yaml
new file mode 100644
index 0000000..8072960
--- /dev/null
+++ b/tests/build/tests.yaml
@@ -0,0 +1,2 @@
+testcase :
+ - Build_AsteriskSCF
-----------------------------------------------------------------------
--
asterisk-scf/integration/testsuite.git
More information about the asterisk-scf-commits
mailing list