From 3bc8f283a2fbfc03b054990194ad8d2ec45cf983 Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Wed, 15 Apr 2015 12:43:58 +0200 Subject: [PATCH] MT#11917 fix typo to re-run tests Change-Id: Ie17777f3b5f6b68df48d8efbbd86d2d3d7db3ed2 --- t/api-journals.t | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/t/api-journals.t b/t/api-journals.t index 015750da70..5a1bce71d1 100644 --- a/t/api-journals.t +++ b/t/api-journals.t @@ -22,8 +22,8 @@ for my $path(qw#/etc/ngcp-panel/ngcp_panel.conf etc/ngcp_panel.conf ngcp_panel.c } } $panel_config //= 'ngcp_panel.conf'; -my $catalyst_config = Config::General->new("../ngcp_panel.conf"); -#my $catalyst_config = Config::General->new($panel_config); +#my $catalyst_config = Config::General->new("../ngcp_panel.conf"); +my $catalyst_config = Config::General->new($panel_config); my %config = $catalyst_config->getall(); my $enable_journal_tests = 1; @@ -38,17 +38,17 @@ my $ssl_ca_cert = $ENV{API_SSL_CA_CERT} || "/etc/ngcp-panel/api_ssl/api_ca.crt"; my ($ua, $req, $res); $ua = LWP::UserAgent->new; -#$ua->ssl_opts( -# SSL_cert_file => $valid_ssl_client_cert, -# SSL_key_file => $valid_ssl_client_key, -# SSL_ca_file => $ssl_ca_cert, -#); - $ua->ssl_opts( - verify_hostname => 0, + SSL_cert_file => $valid_ssl_client_cert, + SSL_key_file => $valid_ssl_client_key, + SSL_ca_file => $ssl_ca_cert, ); -$ua->credentials("127.0.0.1:4443", "api_admin_http", 'administrator', 'administrator'); -#$ua->timeout(500); #useless, need to change the nginx timeout + +#$ua->ssl_opts( +# verify_hostname => 0, +#); +#$ua->credentials("127.0.0.1:4443", "api_admin_http", 'administrator', 'administrator'); +##$ua->timeout(500); #useless, need to change the nginx timeout my $t = time; my $default_reseller_id = 1; @@ -62,16 +62,16 @@ my $customercontact = test_customercontact($t,$reseller); my $customer = test_customer($customercontact,$billingprofile); my $customerpreferences = test_customerpreferences($customer); -#my $subscriberprofileset = test_subscriberprofileset($t,$reseller); -#my $subscriberprofile = test_subscriberprofile($t,$subscriberprofileset); -#my $profilepreferences = test_profilepreferences($subscriberprofile); +my $subscriberprofileset = test_subscriberprofileset($t,$reseller); +my $subscriberprofile = test_subscriberprofile($t,$subscriberprofileset); +my $profilepreferences = test_profilepreferences($subscriberprofile); my $subscriber = test_subscriber($t,$customer,$domain); my $cfdestinationset = test_cfdestinationset($t,$subscriber); -#my $systemsoundset = test_soundset($t,$reseller); -#my $customersoundset = test_soundset($t,$reseller,$customer); -#my $subscriberpreferences = test_subscriberpreferences($subscriber,$customersoundset,$systemsoundset); +my $systemsoundset = test_soundset($t,$reseller); +my $customersoundset = test_soundset($t,$reseller,$customer); +my $subscriberpreferences = test_subscriberpreferences($subscriber,$customersoundset,$systemsoundset);