[svn-commits] rmudgett: testsuite/asterisk/trunk r5307 - in /asterisk/trunk: lib/python/ast...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Thu Jul 24 18:02:07 CDT 2014


Author: rmudgett
Date: Thu Jul 24 18:02:02 2014
New Revision: 5307

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5307
Log:
testsuite: Accountcode propagation.

New tests to check accountcode propagation with the new
accouncode/peeracccount interaction.

* Made pluggable_modules.py Originator class and test_case.py
SimpleTestCase class call origination allow specifying the accountcode.

* Fix tests/cdr/sqlite3 to work with the new accountcode propagation
rules.

* Add accountcode tag to existing tests doing something with accountcode.

AFS-65

Review: https://reviewboard.asterisk.org/r/3832/

Added:
    asterisk/trunk/tests/pbx/accountcode/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/
    asterisk/trunk/tests/pbx/accountcode/dial_none/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/
    asterisk/trunk/tests/pbx/accountcode/dial_none/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/
    asterisk/trunk/tests/pbx/accountcode/dial_none/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/dial_none/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/dial_none/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/dial_none/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/dial_peer_none/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/
    asterisk/trunk/tests/pbx/accountcode/dial_peer_none/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/
    asterisk/trunk/tests/pbx/accountcode/dial_peer_none/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/dial_peer_none/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/dial_peer_none/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/dial_peer_none/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/dial_peer_override/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/
    asterisk/trunk/tests/pbx/accountcode/dial_peer_override/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/
    asterisk/trunk/tests/pbx/accountcode/dial_peer_override/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/dial_peer_override/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/dial_peer_override/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/dial_peer_override/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/dial_predial/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/
    asterisk/trunk/tests/pbx/accountcode/dial_predial/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/
    asterisk/trunk/tests/pbx/accountcode/dial_predial/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/dial_predial/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/dial_predial/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/dial_predial/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/dial_straight_none/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/
    asterisk/trunk/tests/pbx/accountcode/dial_straight_none/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/
    asterisk/trunk/tests/pbx/accountcode/dial_straight_none/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/dial_straight_none/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/dial_straight_none/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/dial_straight_none/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/dial_straight_override/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/
    asterisk/trunk/tests/pbx/accountcode/dial_straight_override/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/
    asterisk/trunk/tests/pbx/accountcode/dial_straight_override/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/dial_straight_override/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/dial_straight_override/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/dial_straight_override/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/local_crossover/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/
    asterisk/trunk/tests/pbx/accountcode/local_crossover/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/
    asterisk/trunk/tests/pbx/accountcode/local_crossover/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/local_crossover/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/local_crossover/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/local_crossover_back/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/
    asterisk/trunk/tests/pbx/accountcode/local_crossover_back/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/
    asterisk/trunk/tests/pbx/accountcode/local_crossover_back/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/local_crossover_back/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/local_crossover_back/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/local_originate/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/
    asterisk/trunk/tests/pbx/accountcode/local_originate/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/configs/
    asterisk/trunk/tests/pbx/accountcode/local_originate/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/local_originate/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/local_originate/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/queue_none/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/
    asterisk/trunk/tests/pbx/accountcode/queue_none/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/
    asterisk/trunk/tests/pbx/accountcode/queue_none/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/queue_none/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/queue_none/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/queue_none/configs/ast1/queues.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/queues.conf
    asterisk/trunk/tests/pbx/accountcode/queue_none/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/queue_peer_none/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/
    asterisk/trunk/tests/pbx/accountcode/queue_peer_none/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/
    asterisk/trunk/tests/pbx/accountcode/queue_peer_none/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/queue_peer_none/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/queue_peer_none/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/queue_peer_none/configs/ast1/queues.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/queues.conf
    asterisk/trunk/tests/pbx/accountcode/queue_peer_none/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/queue_peer_preserve/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/
    asterisk/trunk/tests/pbx/accountcode/queue_peer_preserve/configs/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/
    asterisk/trunk/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/
      - copied from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/
    asterisk/trunk/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/extensions.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/extensions.conf
    asterisk/trunk/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/pjsip.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/pjsip.conf
    asterisk/trunk/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/queues.conf
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/queues.conf
    asterisk/trunk/tests/pbx/accountcode/queue_peer_preserve/test-config.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/test-config.yaml
    asterisk/trunk/tests/pbx/accountcode/tests.yaml
      - copied unchanged from r5305, asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/tests.yaml
Modified:
    asterisk/trunk/lib/python/asterisk/pluggable_modules.py
    asterisk/trunk/lib/python/asterisk/test_case.py
    asterisk/trunk/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml
    asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml
    asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml
    asterisk/trunk/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
    asterisk/trunk/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml
    asterisk/trunk/tests/cdr/cdr_properties/cdr_accountcode/test-config.yaml
    asterisk/trunk/tests/cdr/cdr_unanswered_yes/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_answer/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_busy/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_congestion/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_transfer/test-config.yaml
    asterisk/trunk/tests/cdr/sqlite3/test-config.yaml
    asterisk/trunk/tests/pbx/tests.yaml

Modified: asterisk/trunk/lib/python/asterisk/pluggable_modules.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/pluggable_modules.py?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/lib/python/asterisk/pluggable_modules.py (original)
+++ asterisk/trunk/lib/python/asterisk/pluggable_modules.py Thu Jul 24 18:02:02 2014
@@ -42,6 +42,7 @@
             'scenario-trigger-after': None,
             'scenario-name': None,
             'id': '0',
+            'account': None,
             'async': 'False',
             'event': None,
             'timeout': None,
@@ -111,12 +112,14 @@
                                exten=self.config['exten'],
                                priority=self.config['priority'],
                                timeout=self.config['timeout'],
+                               account=self.config['account'],
                                async=self.config['async'])
         else:
             deferred = self.ami.originate(channel=self.config['channel'],
                                application=self.config['application'],
                                data=self.config['data'],
                                timeout=self.config['timeout'],
+                               account=self.config['account'],
                                async=self.config['async'])
         deferred.addErrback(self.failure)
 

Modified: asterisk/trunk/lib/python/asterisk/test_case.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/test_case.py?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/lib/python/asterisk/test_case.py (original)
+++ asterisk/trunk/lib/python/asterisk/test_case.py Thu Jul 24 18:02:02 2014
@@ -728,6 +728,8 @@
         # unique ID we've assigned, allowing us to associate the Asterisk
         # channel name with the channel we originated
         msg = "Originating call to %s" % call_details['channel']
+        if 'account' not in call_details:
+            call_details['account'] = None
         if 'async' not in call_details:
             call_details['async'] = False
         if 'channelid' not in call_details:
@@ -739,6 +741,7 @@
             deferred = ami.originate(channel=call_details['channel'],
                                      application=call_details['application'],
                                      variable=call_details['variable'],
+                                     account=call_details['account'],
                                      async=call_details['async'],
                                      channelid=call_details['channelid'],
                                      otherchannelid=call_details['otherchannelid'])
@@ -751,6 +754,7 @@
                                      exten=call_details['exten'],
                                      priority=call_details['priority'],
                                      variable=call_details['variable'],
+                                     account=call_details['account'],
                                      async=call_details['async'],
                                      channelid=call_details['channelid'],
                                      otherchannelid=call_details['otherchannelid'])

Modified: asterisk/trunk/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -100,5 +100,6 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - CDR
         - chan_local

Modified: asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -103,5 +103,6 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - CDR
         - chan_local

Modified: asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -64,6 +64,7 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - dial
         - CDR
         - chan_local

Modified: asterisk/trunk/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -79,5 +79,6 @@
         - python : 'starpy'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - SIP
         - CDR

Modified: asterisk/trunk/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -18,6 +18,7 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - CDR
         - SIP
         - transfer

Modified: asterisk/trunk/tests/cdr/cdr_properties/cdr_accountcode/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_properties/cdr_accountcode/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_properties/cdr_accountcode/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/cdr_properties/cdr_accountcode/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -142,5 +142,6 @@
         - python : 'starpy'
         - asterisk : 'cdr_csv'
     tags:
+        - accountcode
         - CDR
         - chan_local

Modified: asterisk/trunk/tests/cdr/cdr_unanswered_yes/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_unanswered_yes/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_unanswered_yes/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/cdr_unanswered_yes/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -69,5 +69,6 @@
         - python : 'starpy'
         - asterisk : 'cdr_csv'
     tags:
+        - accountcode
         - CDR
         - chan_local

Modified: asterisk/trunk/tests/cdr/console_dial_sip_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_answer/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_answer/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_answer/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -55,6 +55,7 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - CDR
         - SIP
         - dial

Modified: asterisk/trunk/tests/cdr/console_dial_sip_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_busy/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_busy/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_busy/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -45,6 +45,7 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - dial
         - CDR
         - SIP

Modified: asterisk/trunk/tests/cdr/console_dial_sip_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_congestion/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_congestion/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_congestion/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -45,6 +45,7 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - dial
         - SIP
         - CDR

Modified: asterisk/trunk/tests/cdr/console_dial_sip_transfer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_transfer/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_transfer/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_transfer/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -91,6 +91,7 @@
         - asterisk : 'cdr_csv'
         - asterisk : 'chan_sip'
     tags:
+        - accountcode
         - dial
         - SIP
         - CDR

Modified: asterisk/trunk/tests/cdr/sqlite3/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/sqlite3/test-config.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/cdr/sqlite3/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/sqlite3/test-config.yaml Thu Jul 24 18:02:02 2014
@@ -22,7 +22,12 @@
     modules:
         -
             minversion: '12.0.0'
+            maxversion: '13.0.0'
             config-section: 'cdr-config-12'
+            typename: 'cdr_sqlite3.CDRSQLite3Verifier'
+        -
+            minversion: '13.0.0'
+            config-section: 'cdr-config-13'
             typename: 'cdr_sqlite3.CDRSQLite3Verifier'
         -
             config-section: 'hangup-monitor'
@@ -33,6 +38,7 @@
     test-iterations:
         -
             channel: 'Local/1000 at default'
+            account: 'orig_foo'
             application: 'Echo'
             async: True
 
@@ -83,6 +89,50 @@
                 test_caller: ''
                 test_callee: ''
 
+cdr-config-13:
+    -
+        asterisk-instance: 0
+        lines:
+            -
+                clid: '"Alice" <555-5555>'
+                dcontext: 'default'
+                channel: 'Local/1000 at default-.{8};2'
+                dstchannel: 'Local/target at default-.{7}1;'
+                lastapp: 'Dial'
+                lastdata: 'Local/target.*'
+                disposition: 'ANSWERED'
+                amaflags: 'BILLING'
+                accountcode: 'foobar'
+                userfield: 'caller_userfield;callee_userfield'
+                test_caller: 'caller_value'
+                test_callee: 'callee_value'
+            -
+                clid: '"" <>'
+                dcontext: 'default'
+                channel: 'Local/1000 at default-.{8};1'
+                dstchannel: ''
+                lastapp: 'Echo'
+                lastdata: ''
+                disposition: 'ANSWERED'
+                amaflags: 'BILLING'
+                accountcode: 'orig_foo'
+                userfield: ''
+                test_caller: ''
+                test_callee: ''
+            -
+                clid: '"Alice" <555-5555>'
+                dcontext: 'default'
+                channel: 'Local/target at default-.{8};2'
+                dstchannel: ''
+                lastapp: 'Echo'
+                lastdata: ''
+                disposition: 'ANSWERED'
+                amaflags: 'OMIT'
+                accountcode: 'foobar'
+                userfield: ''
+                test_caller: ''
+                test_callee: ''
+
 properties:
     minversion: '12.0.0'
     dependencies:
@@ -92,4 +142,5 @@
         - asterisk : 'cdr_sqlite3_custom'
 
     tags:
+        - accountcode
         - CDR

Modified: asterisk/trunk/tests/pbx/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/pbx/tests.yaml?view=diff&rev=5307&r1=5306&r2=5307
==============================================================================
--- asterisk/trunk/tests/pbx/tests.yaml (original)
+++ asterisk/trunk/tests/pbx/tests.yaml Thu Jul 24 18:02:02 2014
@@ -1,5 +1,6 @@
 # Enter tests here in the order they should be considered for execution:
 tests:
+    - dir: 'accountcode'
     - test: 'call_file_retries_archive'
     - test: 'call_file_retries_alwaysdelete'
     - test: 'call_file_retries_fail'




More information about the svn-commits mailing list