[asterisk-commits] dlee: testsuite/asterisk/trunk r3898 - in /asterisk/trunk: configs/ tests/res...

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Jul 11 15:28:43 2013
New Revision: 3898

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3898
Log:
Fixed authentication test for this morning's ARI changes.

Also got rid of the extra http.conf files, since the default testsuite
config is fine. And gave the testsuite a default ARI config.

Added:
    asterisk/trunk/configs/ari.conf
      - copied, changed from r3897, asterisk/trunk/tests/rest_api/continue/configs/ast1/ari.conf
Removed:
    asterisk/trunk/tests/rest_api/authentication/configs/ast1/http.conf
    asterisk/trunk/tests/rest_api/continue/configs/ast1/ari.conf
    asterisk/trunk/tests/rest_api/continue/configs/ast1/http.conf
Modified:
    asterisk/trunk/tests/rest_api/authentication/configs/ast1/ari.conf
    asterisk/trunk/tests/rest_api/authentication/run-test

Copied: asterisk/trunk/configs/ari.conf (from r3897, asterisk/trunk/tests/rest_api/continue/configs/ast1/ari.conf)
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/configs/ari.conf?view=diff&rev=3898&p1=asterisk/trunk/tests/rest_api/continue/configs/ast1/ari.conf&r1=3897&p2=asterisk/trunk/configs/ari.conf&r2=3898
==============================================================================
--- asterisk/trunk/tests/rest_api/continue/configs/ast1/ari.conf (original)
+++ asterisk/trunk/configs/ari.conf Thu Jul 11 15:28:43 2013
@@ -1,5 +1,6 @@
 [general]
 enabled = yes
 
-[user-testsuite]
+[testsuite]
+type = user
 password = testsuite

Modified: asterisk/trunk/tests/rest_api/authentication/configs/ast1/ari.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/authentication/configs/ast1/ari.conf?view=diff&rev=3898&r1=3897&r2=3898
==============================================================================
--- asterisk/trunk/tests/rest_api/authentication/configs/ast1/ari.conf (original)
+++ asterisk/trunk/tests/rest_api/authentication/configs/ast1/ari.conf Thu Jul 11 15:28:43 2013
@@ -1,14 +1,17 @@
 [general]
 enabled = yes
 
-[user-ro]
+[ro]
+type = user
 read_only = yes
 password = ro-pass
 
-[user-rw]
+[rw]
+type = user
 password = rw-pass
 
-[user-crypt]
+[crypt]
+type = user
 ; password = q
 password_format = crypt
 password = $6$Wwpq0WjHUpbzGlWH$Yl0iVJDUzMsG25g5b3gTftVvhMerlO7clXAJidxgmx26cLOOyjcdiSk8PkDJKFGA2Oj0ZN9J.5u3/wkbEwYCd/

Modified: asterisk/trunk/tests/rest_api/authentication/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/authentication/run-test?view=diff&rev=3898&r1=3897&r2=3898
==============================================================================
--- asterisk/trunk/tests/rest_api/authentication/run-test (original)
+++ asterisk/trunk/tests/rest_api/authentication/run-test Thu Jul 11 15:28:43 2013
@@ -47,17 +47,17 @@
         LOGGER.debug("Running %s" % self)
         if self.userpass is None:
             # Test no authentication
-            resp = self.method(build_url('stasis', 'channels'))
+            resp = self.method(build_url('ari', 'channels'))
             self.eval('Unauthenticated', test, resp)
             return
 
         # Test basic auth
-        resp = self.method(build_url('stasis', 'channels'),
+        resp = self.method(build_url('ari', 'channels'),
                            auth=self.userpass)
         self.eval('Basic', test, resp)
 
         # Test api_key auth
-        resp = self.method(build_url('stasis', 'channels'),
+        resp = self.method(build_url('ari', 'channels'),
                            params={'api_key': "%s:%s" % self.userpass})
         self.eval('api_key', test, resp)