Commit 7e270569 authored by Dan Reading's avatar Dan Reading

Use Moose Perl OO package instade of the Mouse package. Mouse broken?

Fixed the message(s) of:
You cannot augment 'TestBed::TestSuite::Experiment=HASH(0x187f420)' because it has no super method at /usr/local/lib/perl/5.14.2/Mouse/Meta/Class.pm line 429.
parent b741a38a
...@@ -29,7 +29,7 @@ perl_version '5.008'; ...@@ -29,7 +29,7 @@ perl_version '5.008';
author 'Testbed Developers <testbed-dev@flux.utah.edu>'; author 'Testbed Developers <testbed-dev@flux.utah.edu>';
version '0.01'; version '0.01';
requires 'Mouse' => '0.22'; requires 'Moose' => '0.22';
requires 'RPC::XML::Client' => '1.24'; requires 'RPC::XML::Client' => '1.24';
requires 'RPC::XML' => '1.41'; requires 'RPC::XML' => '1.41';
requires 'Test::More' => '0.86'; requires 'Test::More' => '0.86';
......
...@@ -61,7 +61,7 @@ sub automate_module_install { ...@@ -61,7 +61,7 @@ sub automate_module_install {
sub install_deps_from_cpan { sub install_deps_from_cpan {
my @deps = qw( my @deps = qw(
Mouse Moose
RPC::XML::Client RPC::XML::Client
RPC::XML RPC::XML
Test::More Test::More
......
...@@ -24,7 +24,7 @@ my $FFDEBUG = 0; ...@@ -24,7 +24,7 @@ my $FFDEBUG = 0;
package TestBed::ForkFramework::Process; package TestBed::ForkFramework::Process;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use POSIX ":sys_wait_h"; use POSIX ":sys_wait_h";
has 'pid' => (is => 'rw'); has 'pid' => (is => 'rw');
...@@ -33,7 +33,7 @@ sub wait { waitpid(shift->pid, 0); } ...@@ -33,7 +33,7 @@ sub wait { waitpid(shift->pid, 0); }
package TestBed::ForkFramework::Channel; package TestBed::ForkFramework::Channel;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use Data::Dumper; use Data::Dumper;
use Carp; use Carp;
use IO::Pipe; use IO::Pipe;
...@@ -59,7 +59,7 @@ sub close { my $s = shift; $s->closeRd; $s->closeWr; } ...@@ -59,7 +59,7 @@ sub close { my $s = shift; $s->closeRd; $s->closeWr; }
package TestBed::ForkFramework::Redir; package TestBed::ForkFramework::Redir;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use Carp; use Carp;
use IO::Pipe; use IO::Pipe;
...@@ -80,7 +80,7 @@ sub close { my $hs = shift->pipes; map { close $_; } @$hs; } ...@@ -80,7 +80,7 @@ sub close { my $hs = shift->pipes; map { close $_; } @$hs; }
package TestBed::ForkFramework::Results; package TestBed::ForkFramework::Results;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
has 'successes' => ( isa => 'ArrayRef', is => 'rw', default => sub { [ ] } ); has 'successes' => ( isa => 'ArrayRef', is => 'rw', default => sub { [ ] } );
has 'errors' => ( isa => 'ArrayRef', is => 'rw', default => sub { [ ] } ); has 'errors' => ( isa => 'ArrayRef', is => 'rw', default => sub { [ ] } );
...@@ -100,7 +100,7 @@ sub handleResult { ...@@ -100,7 +100,7 @@ sub handleResult {
package TestBed::ForkFramework::ItemResult; package TestBed::ForkFramework::ItemResult;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
has 'result' => ( is => 'rw'); has 'result' => ( is => 'rw');
has 'error' => ( is => 'rw'); has 'error' => ( is => 'rw');
...@@ -157,7 +157,7 @@ sub fork_child_redir { ...@@ -157,7 +157,7 @@ sub fork_child_redir {
package TestBed::ForkFramework::Scheduler; package TestBed::ForkFramework::Scheduler;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use IO::Select; use IO::Select;
use Carp; use Carp;
use Data::Dumper; use Data::Dumper;
...@@ -321,7 +321,7 @@ sub schedule { 0; } ...@@ -321,7 +321,7 @@ sub schedule { 0; }
package TestBed::ForkFramework::ForEach; package TestBed::ForkFramework::ForEach;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
has 'maxworkers' => ( is => 'rw', isa => 'Int' , default => 4); has 'maxworkers' => ( is => 'rw', isa => 'Int' , default => 4);
has 'currworkers' => ( is => 'rw', isa => 'Int' , default => 0); has 'currworkers' => ( is => 'rw', isa => 'Int' , default => 0);
...@@ -379,7 +379,7 @@ sub doItem { my ($s, $itemid) = @_; $s->proc->($s->items->[$itemid]); } ...@@ -379,7 +379,7 @@ sub doItem { my ($s, $itemid) = @_; $s->proc->($s->items->[$itemid]); }
package TestBed::ForkFramework::WeightedScheduler::Task; package TestBed::ForkFramework::WeightedScheduler::Task;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
has 'id' => (is => 'rw'); has 'id' => (is => 'rw');
has 'item' => (is => 'rw'); has 'item' => (is => 'rw');
...@@ -401,7 +401,7 @@ package TestBed::ForkFramework::WeightedScheduler; ...@@ -401,7 +401,7 @@ package TestBed::ForkFramework::WeightedScheduler;
use SemiModern::Perl; use SemiModern::Perl;
use Data::Dumper; use Data::Dumper;
use Tools; use Tools;
use Mouse; use Moose;
extends 'TestBed::ForkFramework::Scheduler'; extends 'TestBed::ForkFramework::Scheduler';
......
...@@ -27,7 +27,7 @@ use TestBed::ParallelRunner::Executor; ...@@ -27,7 +27,7 @@ use TestBed::ParallelRunner::Executor;
use TestBed::ForkFramework; use TestBed::ForkFramework;
use TestBed::TestBuilderWrapper; use TestBed::TestBuilderWrapper;
use Data::Dumper; use Data::Dumper;
use Mouse; use Moose;
use TBConfig; use TBConfig;
has executors => ( is => 'rw', default => sub { [] } ); has executors => ( is => 'rw', default => sub { [] } );
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::ParallelRunner::ErrorStrategy; package TestBed::ParallelRunner::ErrorStrategy;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
has 'executor' => (is => 'rw'); has 'executor' => (is => 'rw');
has 'scheduler' => (is => 'rw'); has 'scheduler' => (is => 'rw');
...@@ -89,7 +89,7 @@ sub end_error { shift->ensure_end_and_report; } ...@@ -89,7 +89,7 @@ sub end_error { shift->ensure_end_and_report; }
package TestBed::ParallelRunner::PrerunExpectFail; package TestBed::ParallelRunner::PrerunExpectFail;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
extends 'TestBed::ParallelRunner::ErrorStrategy'; extends 'TestBed::ParallelRunner::ErrorStrategy';
...@@ -100,7 +100,7 @@ sub prerun_error { ...@@ -100,7 +100,7 @@ sub prerun_error {
package TestBed::ParallelRunner::ErrorRetryStrategy; package TestBed::ParallelRunner::ErrorRetryStrategy;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
extends 'TestBed::ParallelRunner::ErrorStrategy'; extends 'TestBed::ParallelRunner::ErrorStrategy';
...@@ -115,7 +115,7 @@ sub swapin_error { ...@@ -115,7 +115,7 @@ sub swapin_error {
package TestBed::ParallelRunner::BackoffStrategy; package TestBed::ParallelRunner::BackoffStrategy;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
has 'starttime' => (is => 'rw', default => sub { time; } ); has 'starttime' => (is => 'rw', default => sub { time; } );
has 'retries' => (is => 'rw', default => 0 ); has 'retries' => (is => 'rw', default => 0 );
......
...@@ -22,40 +22,40 @@ ...@@ -22,40 +22,40 @@
# }}} # }}}
# #
package TestBed::ParallelRunner::Executor::Exception; package TestBed::ParallelRunner::Executor::Exception;
use Mouse; use Moose;
has original => ( is => 'rw'); has original => ( is => 'rw');
no Mouse; no Moose;
package TestBed::ParallelRunner::Executor::PrerunError; package TestBed::ParallelRunner::Executor::PrerunError;
use Mouse; use Moose;
extends('TestBed::ParallelRunner::Executor::Exception'); extends('TestBed::ParallelRunner::Executor::Exception');
no Mouse; no Moose;
package TestBed::ParallelRunner::Executor::SwapinError; package TestBed::ParallelRunner::Executor::SwapinError;
use Mouse; use Moose;
extends('TestBed::ParallelRunner::Executor::Exception'); extends('TestBed::ParallelRunner::Executor::Exception');
no Mouse; no Moose;
package TestBed::ParallelRunner::Executor::RunError; package TestBed::ParallelRunner::Executor::RunError;
use Mouse; use Moose;
extends('TestBed::ParallelRunner::Executor::Exception'); extends('TestBed::ParallelRunner::Executor::Exception');
no Mouse; no Moose;
package TestBed::ParallelRunner::Executor::SwapoutError; package TestBed::ParallelRunner::Executor::SwapoutError;
use Mouse; use Moose;
extends('TestBed::ParallelRunner::Executor::Exception'); extends('TestBed::ParallelRunner::Executor::Exception');
no Mouse; no Moose;
package TestBed::ParallelRunner::Executor::KillError; package TestBed::ParallelRunner::Executor::KillError;
use Mouse; use Moose;
extends('TestBed::ParallelRunner::Executor::Exception'); extends('TestBed::ParallelRunner::Executor::Exception');
no Mouse; no Moose;
package TestBed::ParallelRunner::Executor; package TestBed::ParallelRunner::Executor;
use TestBed::ParallelRunner::ErrorStrategy; use TestBed::ParallelRunner::ErrorStrategy;
use SemiModern::Perl; use SemiModern::Perl;
use TestBed::TestSuite::Experiment; use TestBed::TestSuite::Experiment;
use Mouse; use Moose;
use Data::Dumper; use Data::Dumper;
has 'e' => ( isa => 'TestBed::TestSuite::Experiment', is => 'rw'); has 'e' => ( isa => 'TestBed::TestSuite::Experiment', is => 'rw');
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::TestSuite::Experiment; package TestBed::TestSuite::Experiment;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use TBConfig; use TBConfig;
use TestBed::XMLRPC::Client::Experiment; use TestBed::XMLRPC::Client::Experiment;
use TestBed::Wrap::tevc; use TestBed::Wrap::tevc;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::TestSuite::Link; package TestBed::TestSuite::Link;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
#use TestBed::XMLRPC::Client::Link; #use TestBed::XMLRPC::Client::Link;
use Tools::Network; use Tools::Network;
use Tools::TBSSH; use Tools::TBSSH;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::TestSuite::Node; package TestBed::TestSuite::Node;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use Tools; use Tools;
use Tools::Network; use Tools::Network;
use Tools::TBSSH; use Tools::TBSSH;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::XMLRPC::Client; package TestBed::XMLRPC::Client;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use RPC::XML::Client; use RPC::XML::Client;
use Net::SSL; use Net::SSL;
use LWP::Protocol::https; use LWP::Protocol::https;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::XMLRPC::Client::Emulab; package TestBed::XMLRPC::Client::Emulab;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use Data::Dumper; use Data::Dumper;
extends 'TestBed::XMLRPC::Client'; extends 'TestBed::XMLRPC::Client';
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::XMLRPC::Client::Experiment; package TestBed::XMLRPC::Client::Experiment;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use Data::Dumper; use Data::Dumper;
use TestBed::XMLRPC::Client::NodeInfo; use TestBed::XMLRPC::Client::NodeInfo;
use TBConfig; use TBConfig;
......
...@@ -26,7 +26,7 @@ use Mouse; ...@@ -26,7 +26,7 @@ use Mouse;
package TestBed::XMLRPC::Client::Node; package TestBed::XMLRPC::Client::Node;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use Data::Dumper; use Data::Dumper;
extends 'TestBed::XMLRPC::Client'; extends 'TestBed::XMLRPC::Client';
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# #
package TestBed::XMLRPC::Client::OSID; package TestBed::XMLRPC::Client::OSID;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use Data::Dumper; use Data::Dumper;
extends 'TestBed::XMLRPC::Client'; extends 'TestBed::XMLRPC::Client';
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
package Tools::TBSSH; package Tools::TBSSH;
use SemiModern::Perl; use SemiModern::Perl;
use Data::Dumper; use Data::Dumper;
use Mouse; use Moose;
eval{ eval{
#force use of 'Tools::WrappedSSH' #force use of 'Tools::WrappedSSH'
......
...@@ -26,7 +26,7 @@ use SemiModern::Perl; ...@@ -26,7 +26,7 @@ use SemiModern::Perl;
use Data::Dumper; use Data::Dumper;
use TBConfig; use TBConfig;
use IPC::Run3; use IPC::Run3;
use Mouse; use Moose;
has 'host' => ( isa => 'Str', is => 'rw'); has 'host' => ( isa => 'Str', is => 'rw');
has 'user' => ( isa => 'Str', is => 'rw'); has 'user' => ( isa => 'Str', is => 'rw');
......
...@@ -36,6 +36,6 @@ ok($emuclient, 'Emulab new works'); ...@@ -36,6 +36,6 @@ ok($emuclient, 'Emulab new works');
isa_ok($emuclient, 'TestBed::XMLRPC::Client::Emulab'); isa_ok($emuclient, 'TestBed::XMLRPC::Client::Emulab');
my $time = timegm(0,0,0,1,0,2008); my $time = timegm(0,0,0,1,0,2008);
my $utctime => time2iso8601($time); # chop off the Z my $utctime = time2iso8601($time); # chop off the Z
my $resp = $emuclient->news('starting' => chop($utctime)); #? chop off the trailing Z my $resp = $emuclient->news('starting' => chop($utctime)); #? chop off the trailing Z
ok($resp, 'Valid Emulab::new response'); ok($resp, 'Valid Emulab::new response');
...@@ -38,6 +38,7 @@ BEGIN { ...@@ -38,6 +38,7 @@ BEGIN {
use lib qw(lib tests); use lib qw(lib tests);
use SemiModern::Perl; use SemiModern::Perl;
use Moose;
use Data::Dumper; use Data::Dumper;
use TBConfig; use TBConfig;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# #
package Event; package Event;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
has 'start' => (is => 'rw'); has 'start' => (is => 'rw');
has 'end' => (is => 'rw'); has 'end' => (is => 'rw');
...@@ -36,7 +36,7 @@ sub update { ...@@ -36,7 +36,7 @@ sub update {
package TrafficGenLister; package TrafficGenLister;
use SemiModern::Perl; use SemiModern::Perl;
use Mouse; use Moose;
use IO::Socket::INET; use IO::Socket::INET;
use IO::Handle; use IO::Handle;
use Test::More; use Test::More;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment