Skip to content

Commit

Permalink
move ssl files among other resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@guillomovitch
guillomovitch committed Aug 1, 2012
1 parent d990743 commit 76dccde
Show file tree
Hide file tree
Showing 23 changed files with 24 additions and 24 deletions.
0 t/ssl/cnf/alternate.cnf → resources/ssl/cnf/alternate.cnf
View file
File renamed without changes.
0 t/ssl/cnf/bad.cnf → resources/ssl/cnf/bad.cnf
View file
File renamed without changes.
0 t/ssl/cnf/ca.cnf → resources/ssl/cnf/ca.cnf
View file
File renamed without changes.
0 t/ssl/cnf/good-sha256.cnf → resources/ssl/cnf/good-sha256.cnf
View file
File renamed without changes.
0 t/ssl/cnf/good.cnf → resources/ssl/cnf/good.cnf
View file
File renamed without changes.
0 t/ssl/cnf/joker.cnf → resources/ssl/cnf/joker.cnf
View file
File renamed without changes.
0 t/ssl/cnf/wrong.cnf → resources/ssl/cnf/wrong.cnf
View file
File renamed without changes.
0 t/ssl/crt/alternate.pem → resources/ssl/crt/alternate.pem
View file
File renamed without changes.
0 t/ssl/crt/bad.pem → resources/ssl/crt/bad.pem
View file
File renamed without changes.
0 t/ssl/crt/ca.pem → resources/ssl/crt/ca.pem
View file
File renamed without changes.
0 t/ssl/crt/good-sha256.pem → resources/ssl/crt/good-sha256.pem
View file
File renamed without changes.
0 t/ssl/crt/good.pem → resources/ssl/crt/good.pem
View file
File renamed without changes.
0 t/ssl/crt/joker.pem → resources/ssl/crt/joker.pem
View file
File renamed without changes.
0 t/ssl/crt/wrong.pem → resources/ssl/crt/wrong.pem
View file
File renamed without changes.
0 t/ssl/key/alternate.pem → resources/ssl/key/alternate.pem
View file
File renamed without changes.
0 t/ssl/key/bad.pem → resources/ssl/key/bad.pem
View file
File renamed without changes.
0 t/ssl/key/ca.pem → resources/ssl/key/ca.pem
View file
File renamed without changes.
0 t/ssl/key/good-sha256.pem → resources/ssl/key/good-sha256.pem
View file
File renamed without changes.
0 t/ssl/key/good.pem → resources/ssl/key/good.pem
View file
File renamed without changes.
0 t/ssl/key/joker.pem → resources/ssl/key/joker.pem
View file
File renamed without changes.
0 t/ssl/key/wrong.pem → resources/ssl/key/wrong.pem
View file
File renamed without changes.
20 changes: 10 additions & 10 deletions t/components/client/connection.t
View file
Expand Up @@ -121,8 +121,8 @@ $server = FusionInventory::Test::Server->new(
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/good.pem',
key => 't/ssl/key/good.pem',
crt => 'resources/ssl/crt/good.pem',
key => 'resources/ssl/key/good.pem',
);
$server->set_dispatch({
'/public' => $ok,
Expand Down Expand Up @@ -179,7 +179,7 @@ subtest "correct response" => sub {
lives_ok {
$client = FusionInventory::Agent::HTTP::Client->new(
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
);
} 'instanciation: https';

Expand All @@ -193,7 +193,7 @@ subtest "correct response" => sub {
lives_ok {
$client = FusionInventory::Agent::HTTP::Client->new(
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
);
} 'instanciation: https, auth, no credentials';

Expand All @@ -211,7 +211,7 @@ lives_ok {
user => 'test',
password => 'test',
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
);
} 'instanciation: https, auth, credentials';

Expand Down Expand Up @@ -308,8 +308,8 @@ $server = FusionInventory::Test::Server->new(
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/good.pem',
key => 't/ssl/key/good.pem',
crt => 'resources/ssl/crt/good.pem',
key => 'resources/ssl/key/good.pem',
);
$server->set_dispatch({
'/public' => sub { return $ok->(@_) if $ENV{HTTP_X_FORWARDED_FOR}; },
Expand Down Expand Up @@ -369,7 +369,7 @@ subtest "correct response" => sub {
lives_ok {
$client = FusionInventory::Agent::HTTP::Client->new(
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
proxy => $proxy->url(),
);
} 'instanciation: https, proxy';
Expand All @@ -384,7 +384,7 @@ subtest "correct response" => sub {
lives_ok {
$client = FusionInventory::Agent::HTTP::Client->new(
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
proxy => $proxy->url()
);
} 'instanciation: https, proxy, auth, no credentials';
Expand All @@ -403,7 +403,7 @@ lives_ok {
user => 'test',
password => 'test',
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
proxy => $proxy->url()
);
} 'instanciation: https, proxy, auth, credentials';
Expand Down
28 changes: 14 additions & 14 deletions t/components/client/ssl.t
View file
Expand Up @@ -52,12 +52,12 @@ my $unsafe_client = FusionInventory::Agent::HTTP::Client->new(
);
my $secure_client = FusionInventory::Agent::HTTP::Client->new(
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
);

my $secure_sha256_client = FusionInventory::Agent::HTTP::Client->new(
logger => $logger,
ca_cert_file => 't/ssl/crt/ca.pem',
ca_cert_file => 'resources/ssl/crt/ca.pem',
);

# ensure the server get stopped even if an exception is thrown
Expand All @@ -70,8 +70,8 @@ $server = FusionInventory::Test::Server->new(
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/good.pem',
key => 't/ssl/key/good.pem',
crt => 'resources/ssl/crt/good.pem',
key => 'resources/ssl/key/good.pem',
);
$server->set_dispatch({
'/public' => $ok,
Expand All @@ -92,8 +92,8 @@ $server = FusionInventory::Test::Server->new(
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/good-sha256.pem',
key => 't/ssl/key/good-sha256.pem',
crt => 'resources/ssl/crt/good-sha256.pem',
key => 'resources/ssl/key/good-sha256.pem',
);
$server->set_dispatch({
'/public' => $ok,
Expand All @@ -114,8 +114,8 @@ $server = FusionInventory::Test::Server->new(
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/alternate.pem',
key => 't/ssl/key/alternate.pem',
crt => 'resources/ssl/crt/alternate.pem',
key => 'resources/ssl/key/alternate.pem',
);
$server->set_dispatch({
'/public' => $ok,
Expand Down Expand Up @@ -144,8 +144,8 @@ SKIP: {
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/joker.pem',
key => 't/ssl/key/joker.pem',
crt => 'resources/ssl/crt/joker.pem',
key => 'resources/ssl/key/joker.pem',
);
$server->set_dispatch({
'/public' => $ok,
Expand All @@ -169,8 +169,8 @@ $server = FusionInventory::Test::Server->new(
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/wrong.pem',
key => 't/ssl/key/wrong.pem',
crt => 'resources/ssl/crt/wrong.pem',
key => 'resources/ssl/key/wrong.pem',
);
$server->set_dispatch({
'/public' => $ok,
Expand All @@ -196,8 +196,8 @@ $server = FusionInventory::Test::Server->new(
realm => 'test',
password => 'test',
ssl => 1,
crt => 't/ssl/crt/bad.pem',
key => 't/ssl/key/bad.pem',
crt => 'resources/ssl/crt/bad.pem',
key => 'resources/ssl/key/bad.pem',
);
$server->set_dispatch({
'/public' => $ok,
Expand Down

0 comments on commit 76dccde

Please sign in to comment.