From 004fe8a2cb4cba5d0debba8166c985f2dfce1268 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sat, 10 Dec 2011 22:39:06 +0100 Subject: [PATCH] pass slice group name to new --- lib/CloudStore/API.pm | 14 ++++++++------ t/API.t | 5 +---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/CloudStore/API.pm b/lib/CloudStore/API.pm index c6aed04..7913d36 100644 --- a/lib/CloudStore/API.pm +++ b/lib/CloudStore/API.pm @@ -11,14 +11,16 @@ use File::Find; use Data::Dump qw(dump); sub new { - my $class = shift; - my $self = {@_}; + my ($class,$group) = @_; + + my ( undef, $dir, $port, undef ) = getgrnam($group) || die "can't find group $group: $!"; + my $self = { + passwd => '/var/lib/extrausers/passwd', + PORT => $port, + SLICE => $dir, + }; bless $self, $class; - $self->{passwd} ||= '/var/lib/extrausers/passwd'; - $self->{PORT} ||= $ENV{PORT} || die "no PORT in env"; - $self->{SLICE} ||= $ENV{SLICE} || die "no SLICE in env"; - $self->{md5} = $self->user_info('md5'); return $self; diff --git a/t/API.t b/t/API.t index 2083c28..7a22ef8 100755 --- a/t/API.t +++ b/t/API.t @@ -9,10 +9,7 @@ use lib 'lib'; use_ok 'CloudStore::API'; -$ENV{PORT}=6500; -$ENV{SLICE}='/tmp/'; - -ok my $o = CloudStore::API->new, 'new'; +ok my $o = CloudStore::API->new('s1'), 'new'; cmp_ok $o->create_user('md5@example.com','md5sum',0), '==', 2000, 'create_user md5'; -- 2.20.1