[asterisk-commits] dlee: branch dlee/ari-bridge-tests r4064 - in /asterisk/team/dlee/ari-bridge-...

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Aug 22 10:59:33 2013
New Revision: 4064

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4064
Log:
Merged revisions 4063 from http://svn.asterisk.org/svn/testsuite/asterisk/team/dlee/matts-ari-patch

Modified:
    asterisk/team/dlee/ari-bridge-tests/   (props changed)
    asterisk/team/dlee/ari-bridge-tests/addons/Makefile
    asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/ari.py
    asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/configs/ast1/ari.conf
    asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/test-config.yaml

Propchange: asterisk/team/dlee/ari-bridge-tests/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 22 10:59:33 2013
@@ -1,1 +1,1 @@
-/asterisk/team/dlee/matts-ari-patch:1-4053
+/asterisk/team/dlee/matts-ari-patch:1-4063

Modified: asterisk/team/dlee/ari-bridge-tests/addons/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/addons/Makefile?view=diff&rev=4064&r1=4063&r2=4064
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/addons/Makefile (original)
+++ asterisk/team/dlee/ari-bridge-tests/addons/Makefile Thu Aug 22 10:59:33 2013
@@ -6,7 +6,12 @@
 # the GNU General Public License Version 2.
 #
 
-all: starpy-update
+all:
+	@if [ ! -d starpy ]; then \
+		echo "starpy/ does not exist.  Run \`make update\` to checkout via git."; \
+	else \
+		echo "Run \`make install\`."; \
+	fi
 
 clean: _clean
 
@@ -14,41 +19,16 @@
 
 dist-clean: distclean
 
-distclean: _clean starpy-clean autobahn-uninstall
-
-install: starpy-install autobahn-install
-
-uninstall: starpy-uninstall autobahn-uninstall
-
-update: starpy-update autobahn-update
-
-# autobahn targets
-
-autobahn-update:
-	pip install --upgrade autobahn
-
-autobahn-install:
-	pip install autobahn
-
-autobahn-uninstall:
-	pip uninstall autobahn
-
-# starpy targets
-
-starpy-install:
-	@if [ ! -d starpy ]; then \
-		echo "starpy/ does not exist.  Run \`make update\` to checkout via git."; \
-	else \
-		(cd starpy; python setup.py install --prefix=~/.local --record install.record) \
-	fi
-
-starpy-clean:
+distclean: _clean
 	rm -rf starpy/install.record
 
-starpy-uninstall:
+install:
+	(cd starpy; python setup.py install --prefix=~/.local --record install.record)
+
+uninstall:
 	rm -rf $$(cat starpy/install.record)
 
-starpy-update:
+update:
 	@if [ -d starpy ]; then \
 		cd starpy; \
 		if [ `git config --get remote.origin.url` = git://github.com/asterisk-org/starpy.git ]; then \
@@ -58,10 +38,3 @@
 	else \
 		git clone git://github.com/asterisk/starpy.git; \
 	fi
-	@echo "+--------- StarPY Downloaded ---------+"
-	@echo "+ StarPY has been successfully cloned +"
-	@echo "+ from its git repo. It can be        +"
-	@echo "+ installed by running:               +"
-	@echo "+                                     +"
-	@echo "+          make install               +"
-	@echo "+-------------------------------------+"

Modified: asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/ari.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/ari.py?view=diff&rev=4064&r1=4063&r2=4064
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/ari.py (original)
+++ asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/ari.py Thu Aug 22 10:59:33 2013
@@ -72,9 +72,8 @@
         self.timed_out = False
 
         if self.iterations is None:
-            self.iterations = []
-            self.iterations.append({'channel': 'Local/s at default',
-                                    'application': 'Echo'})
+            self.iterations = [{'channel': 'Local/s at default',
+                'application': 'Echo'}]
 
         self.create_asterisk(count=1)
 

Modified: asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/configs/ast1/ari.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/configs/ast1/ari.conf?view=diff&rev=4064&r1=4063&r2=4064
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/configs/ast1/ari.conf (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/configs/ast1/ari.conf Thu Aug 22 10:59:33 2013
@@ -1,6 +1,0 @@
-[general]
-enabled = yes
-
-[testsuite]
-type=user
-password = testsuite

Modified: asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/test-config.yaml?view=diff&rev=4064&r1=4063&r2=4064
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/rest_api/continue/test-config.yaml Thu Aug 22 10:59:33 2013
@@ -17,7 +17,6 @@
 
 
 ari-config:
-    apps: continue-test
     events:
         -   conditions:
                 match:
@@ -53,7 +52,7 @@
         - python : requests
         - python : twisted
         - python : starpy
-        - asterisk : res_ari_channels
+        - asterisk : res_stasis_http_channels
         - asterisk : app_echo
     tags:
         - ARI