Index: trunk/Nebulous-Server/Changes
===================================================================
--- trunk/Nebulous-Server/Changes	(revision 5665)
+++ trunk/Nebulous-Server/Changes	(revision 5667)
@@ -2,4 +2,5 @@
 
 0.02
+    - rename test files
     - [nebclient] VERSION to '0.0.2'
     - Nebulous::Client, Nebulous::Server, & Nebulous::Server::SQL
Index: trunk/Nebulous-Server/MANIFEST
===================================================================
--- trunk/Nebulous-Server/MANIFEST	(revision 5665)
+++ trunk/Nebulous-Server/MANIFEST	(revision 5667)
@@ -74,21 +74,24 @@
 t/07_server_find_instances.t
 t/08_server_delete_instance.t
+t/09_server_is_valid_class_id.t
 t/09_server_stat_object.t
-t/09_server_is_valid_class_id.t
-t/10_client_new.t
-t/11_client_create.t
-t/12_client_replicate.t
-t/13_client_cull.t
-t/14_client_lock.t
-t/15_client_unlock.t
-t/16_client_find_instances.t
-t/17_client_find.t
-t/18_client_open.t
-t/19_client_delete.t
-t/20_client_copy.t
-t/21_client_move.t
-t/22_client_delete_instance.t
-t/23_client_stat.t
-t/24_nebclient.t
+t/10_server_is_valid_volume_name.t
+t/11_server_is_valid_class_id.t
+t/50_client_new.t
+t/51_client_create.t
+t/51_client_open_create.t
+t/52_client_replicate.t
+t/53_client_cull.t
+t/54_client_lock.t
+t/55_client_unlock.t
+t/56_client_find_instances.t
+t/57_client_find.t
+t/58_client_open.t
+t/59_client_delete.t
+t/60_client_copy.t
+t/61_client_move.t
+t/62_client_delete_instance.t
+t/63_client_stat.t
+t/90_nebclient.t
 t/TEST.PL
 t/Test/Nebulous.pm
Index: trunk/Nebulous-Server/t/09_server_is_valid_volume_name.t
===================================================================
--- trunk/Nebulous-Server/t/09_server_is_valid_volume_name.t	(revision 5665)
+++ 	(revision )
@@ -1,40 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 09_server_is_valid_volume_name.t,v 1.1 2005-11-10 21:51:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Test::More tests => 3;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Server;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $neb = "Nebulous::Server";
-
-$neb->init(
-    dsn         => "DBI:mysql:database=test:host=localhost",
-    dbuser      => "test",
-    dbpasswd    => "",
-);
-
-*_is_valid_volume_name = \&Nebulous::Server::_is_valid_volume_name;
-
-Test::Nebulous->setup;
-
-ok( _is_valid_volume_name( 'node01' ), "valid volume name" );
-
-Test::Nebulous->setup;
-
-ok( _is_valid_volume_name( 'node02' ), "valid volume name" );
-
-Test::Nebulous->setup;
-
-is( _is_valid_volume_name( 'node99' ), undef, "invalid volume name" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/10_client_new.t
===================================================================
--- trunk/Nebulous-Server/t/10_client_new.t	(revision 5665)
+++ 	(revision )
@@ -1,60 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 10_client_new.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 4;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    isa_ok( $neb, "Nebulous::Client" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-        uri   => "http://example.com/PS/IPP/Nebulous/Client",
-    );
-
-    isa_ok( $neb, "Nebulous::Client" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    Nebulous::Client->new;
-};
-like( $@, qr/Mandatory parameter/, "no proxy" );
-
-Test::Nebulous->setup;
-
-eval {
-    Nebulous::Client->new(
-        proxy => "foo",
-        dog => "do"
-    );
-};
-like( $@, qr/not listed in the validation options/, "bad param" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t
===================================================================
--- trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t	(revision 5667)
+++ trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t	(revision 5667)
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+# Copryight (C) 2004-2005  Joshua Hoblitt
+#
+# $Id: 10_server_is_valid_volume_name.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+
+use strict;
+use warnings FATAL => qw( all );
+
+use Test::More tests => 3;
+
+use lib qw( ./t ./lib );
+
+use Nebulous::Server;
+use Nebulous::Util qw( :standard );
+use Test::Nebulous;
+
+my $neb = "Nebulous::Server";
+
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
+);
+
+*_is_valid_volume_name = \&Nebulous::Server::_is_valid_volume_name;
+
+Test::Nebulous->setup;
+
+ok( _is_valid_volume_name( 'node01' ), "valid volume name" );
+
+Test::Nebulous->setup;
+
+ok( _is_valid_volume_name( 'node02' ), "valid volume name" );
+
+Test::Nebulous->setup;
+
+is( _is_valid_volume_name( 'node99' ), undef, "invalid volume name" );
+
+Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/11_client_create.t
===================================================================
--- trunk/Nebulous-Server/t/11_client_create.t	(revision 5665)
+++ 	(revision )
@@ -1,107 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 11_client_create.t,v 1.5 2005-12-03 02:26:59 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 7;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $filename = $neb->create( "foo" );
-
-    ok( -e $filename, "good filename" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $filename = $neb->create( "foo", 0 );
-
-    ok( -e $filename, "good filename" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $filename = $neb->create( "foo", 0, "node01" );
-
-    ok( -e $filename, "good filename" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume, comment
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $filename = $neb->create( "foo", 0, "node01", "this is foo" );
-
-    ok( -e $filename, "good filename" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->create( "foo" );
-    is( $neb->create( "foo" ), undef, "object already exists" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->create();
-};
-like( $@, qr/2 - 4 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->create( 1, 2, 3, 4, 5 );
-};
-like( $@, qr/2 - 4 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/11_client_open_create.t
===================================================================
--- trunk/Nebulous-Server/t/11_client_open_create.t	(revision 5665)
+++ 	(revision )
@@ -1,107 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 11_client_open_create.t,v 1.1 2005-12-03 02:26:59 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 7;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $fh = $neb->open_create( "foo" );
-
-    is( ref $fh, 'GLOB', "good filehandle" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $fh = $neb->open_create( "foo", 0 );
-
-    is( ref $fh, 'GLOB', "good filehandle" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $fh = $neb->open_create( "foo", 0, "node01" );
-
-    is( ref $fh, 'GLOB', "good filehandle" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, class, volume, comment
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $fh = $neb->open_create( "foo", 0, "node01", "this is foo" );
-
-    is( ref $fh, 'GLOB', "good filehandle" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->open_create( "foo" );
-    is( $neb->open_create( "foo" ), undef, "object already exists" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->open_create();
-};
-like( $@, qr/2 - 4 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->open_create( 1, 2, 3, 4, 5 );
-};
-like( $@, qr/2 - 4 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/11_server_is_valid_class_id.t
===================================================================
--- trunk/Nebulous-Server/t/11_server_is_valid_class_id.t	(revision 5667)
+++ trunk/Nebulous-Server/t/11_server_is_valid_class_id.t	(revision 5667)
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+# Copryight (C) 2004-2005  Joshua Hoblitt
+#
+# $Id: 11_server_is_valid_class_id.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+
+use strict;
+use warnings FATAL => qw( all );
+
+use Test::More tests => 3;
+
+use lib qw( ./t ./lib );
+
+use Nebulous::Server;
+use Nebulous::Util qw( :standard );
+use Test::Nebulous;
+
+my $neb = "Nebulous::Server";
+
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
+);
+
+*_is_valid_class_id = \&Nebulous::Server::_is_valid_class_id;
+
+Test::Nebulous->setup;
+
+# 0 is the default and is guarenteed to exist
+ok( _is_valid_class_id( 0 ), "default class id");
+
+Test::Nebulous->setup;
+
+# the test setup adds class id 1
+ok( _is_valid_class_id( 1 ), "custom class id");
+
+Test::Nebulous->setup;
+
+is( _is_valid_class_id( 99 ), undef, "invalid class id");
+
+Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/12_client_replicate.t
===================================================================
--- trunk/Nebulous-Server/t/12_client_replicate.t	(revision 5665)
+++ 	(revision )
@@ -1,101 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 12_client_replicate.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 11;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    my $uri = $neb->replicate( "foo" );
-
-    ok( $uri, "good replication" );
-    ok( -e _get_file_path( $uri ), "file exists" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, $volume
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    my $uri = $neb->replicate( "foo", "node01" );
-
-    ok( $uri, "good replication" );
-    ok( -e _get_file_path( $uri ), "file exists" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, $volume
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    my $uri1 = $neb->replicate( "foo", "node01" );
-    my $uri2 = $neb->replicate( "foo", "node02" );
-
-    ok( $uri1, "good replication" );
-    ok( $uri2, "good replication" );
-    ok( -e _get_file_path( $uri1 ), "file exists" );
-    ok( -e _get_file_path( $uri2 ), "file exists" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    my $uri = $neb->replicate( "foo" );
-
-    is( $uri, undef, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->replicate();
-};
-like( $@, qr/1 - 2 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->replicate( 1, 2, 3 );
-};
-like( $@, qr/1 - 2 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/13_client_cull.t
===================================================================
--- trunk/Nebulous-Server/t/13_client_cull.t	(revision 5665)
+++ 	(revision )
@@ -1,131 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 13_client_cull.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 15;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
-
-    my $uri = $neb->cull( "foo" );
-
-    ok( $uri, "good cull" );
-    ok( ! -e _get_file_path( $uri ), "file doesn't exist" );
-}
-
-Test::Nebulous->setup;
-
-SKIP: {
-    skip "unsure if this should be part of the API", 2;
-
-    # key, $volume
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->replicate( "foo", "node01" );
-
-    my $uri = $neb->cull( "foo", "node01" );
-
-    ok( $uri, "good cull" );
-    ok( ! -e _get_file_path( $uri ), "file exists" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->replicate( "foo", "node01" );
-    $neb->replicate( "foo", "node02" );
-
-    my $uri1 = $neb->cull( "foo" );
-    my $uri2 = $neb->cull( "foo" );
-
-    ok( $uri1, "good cull" );
-    ok( $uri2, "good cull" );
-    ok( ! -e _get_file_path( $uri1 ), "file exists" );
-    ok( ! -e _get_file_path( $uri2 ), "file exists" );
-}
-
-Test::Nebulous->setup;
-
-SKIP: {
-    skip "unsure if this should be part of the API", 4;
-
-    # key, $volume
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->replicate( "foo", "node01" );
-    $neb->replicate( "foo", "node02" );
-
-    my $uri1 = $neb->cull( "foo", "node01" );
-    my $uri2 = $neb->cull( "foo", "node02" );
-
-    ok( $uri1, "good cull" );
-    ok( $uri2, "good cull" );
-    ok( ! -e _get_file_path( $uri1 ), "file exists" );
-    ok( ! -e _get_file_path( $uri2 ), "file exists" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    my $uri = $neb->cull( "foo" );
-
-    is( $uri, undef, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->cull();
-};
-like( $@, qr/1 was expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->cull( 1, 2 );
-};
-like( $@, qr/1 was expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/14_client_lock.t
===================================================================
--- trunk/Nebulous-Server/t/14_client_lock.t	(revision 5665)
+++ 	(revision )
@@ -1,273 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 14_client_lock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 19;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key, type
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->lock( "foo", "read" ), "read lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, type, timeout
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->lock( "foo", "read", 10 ), "read lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->lock( "foo", "read" ), "read lock" );
-    ok( $neb->lock( "foo", "read" ), "read lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, type
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->lock( "foo", "write" ), "write lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, type, timeout
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->lock( "foo", "write", 10 ), "write lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( $neb->lock( "foo", "read" ), undef, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( $neb->lock( "foo", "write" ), undef, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-diag "testing a spinlock, this will be a litle slow...";
-
-eval {
-    local $SIG{ALRM} = sub { alarm 0; die "timeout"; };
-    alarm 8;
-
-    # key, type, timeout
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->lock( "foo", "read" );
-    $neb->lock( "foo", "write" );
-
-    alarm 0;
-};
-like( $@, qr/timeout/, "default spinlock" );
-
-Test::Nebulous->setup;
-
-diag "testing a spinlock, this will be a litle slow...";
-
-eval {
-    local $SIG{ALRM} = sub { alarm 0; die "timeout"; };
-    alarm 12;
-
-    # key, type, timeout
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->lock( "foo", "read" );
-    unless ( $neb->lock( "foo", "write" ) ) {
-        alarm 0;
-        die "gaveup";
-    }
-
-    alarm 0;
-};
-like( $@, qr/gaveup/, "default spinlock" );
-
-Test::Nebulous->setup;
-
-diag "testing a spinlock, this will be a litle slow...";
-
-eval {
-    local $SIG{ALRM} = sub { alarm 0; die "timeout"; };
-    alarm 3;
-
-    # key, type, timeout
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->lock( "foo", "read" );
-    $neb->lock( "foo", "write", 5 );
-
-    alarm 0;
-};
-like( $@, qr/timeout/, "specified spinlock" );
-
-Test::Nebulous->setup;
-
-diag "testing a spinlock, this will be a litle slow...";
-
-eval {
-    local $SIG{ALRM} = sub { alarm 0; die "timeout"; };
-    alarm 7;
-
-    # key, type, timeout
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->lock( "foo", "read" );
-    unless ( $neb->lock( "foo", "write", 5 ) ) {
-        alarm 0;
-        die "gaveup";
-    }
-
-    alarm 0;
-};
-
-like( $@, qr/gaveup/, "specified spinlock" );
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->lock( "foo", "write" );
-    is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock twice" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->lock( "foo", "read" );
-    is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock after read lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    $neb->lock( "foo", "write" );
-    is( $neb->lock( "foo", "read", 1 ), undef, "can not read lock after write lock" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->lock();
-};
-like( $@, qr/2 - 3 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->lock( "foo" );
-};
-like( $@, qr/2 - 3 were expected/, "not enough params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->lock( "foo", "both" );
-};
-like( $@, qr/is read or write/, "not read or write" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->lock( "foo", 'read', 3, "bar" );
-};
-like( $@, qr/2 - 3 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/15_client_unlock.t
===================================================================
--- trunk/Nebulous-Server/t/15_client_unlock.t	(revision 5665)
+++ 	(revision )
@@ -1,170 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 15_client_unlock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 14;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->lock( "foo", "read" );
-
-    ok( $neb->unlock( "foo", "read" ), "read unlock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->lock( "foo", "read" );
-    $neb->lock( "foo", "read" );
-
-    ok( $neb->unlock( "foo", "read" ), "read unlock" );
-    ok( $neb->unlock( "foo", "read" ), "read unlock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->lock( "foo", "write" );
-
-    ok( $neb->unlock( "foo", "write" ), "write unlock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( $neb->unlock( "foo", "read" ), undef, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( $neb->unlock( "foo", "write" ), undef, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    is( $neb->unlock( "foo", "read" ), undef, "no lock set" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    is( $neb->unlock( "foo", "write" ), undef, "no lock set" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->lock( "foo", "write" );
-
-    is( $neb->unlock( "foo", "read" ), undef, "read unlock under write lock" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->lock( "foo", "read" );
-
-    is( $neb->unlock( "foo", "write" ), undef, "write unlock under read lock" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->unlock();
-};
-like( $@, qr/2 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->unlock( "foo" );
-};
-like( $@, qr/2 were expected/, "not enough params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->unlock( "foo", "both" );
-};
-like( $@, qr/is read or write/, "not read or write" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->unlock( "foo", 'read', 3 );
-};
-like( $@, qr/2 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/16_client_find_instances.t
===================================================================
--- trunk/Nebulous-Server/t/16_client_find_instances.t	(revision 5665)
+++ 	(revision )
@@ -1,124 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 16_client_find_instances.t,v 1.6 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 19;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    my $locations = $neb->find_instances( "foo" );
-
-    is( scalar @$locations, 1, "found 1" );
-    like( @$locations[0], qr/file:/, "URIs match" );
-    ok( -e _get_file_path( @$locations[0] ), "URI matches file" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
-
-    my $locations = $neb->find_instances( "foo" );
-
-    is( scalar @$locations, 2, "found 2" );
-    like( @$locations[0], qr/file:/, "URIs match" );
-    like( @$locations[1], qr/file:/, "URIs match" );
-    ok( -e _get_file_path( @$locations[0] ), "URI matches file" );
-    ok( -e _get_file_path( @$locations[1] ), "URI matches file" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key, volume
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    my $locations = $neb->find_instances( "foo", "node01" );
-
-    is( scalar @$locations, 1, "found 1" );
-    like( @$locations[0], qr/file:/, "URIs match" );
-    ok( -e _get_file_path( @$locations[0] ), "URI matches file" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
-
-    my $locations = $neb->find_instances( "foo", "node01" );
-
-    is( scalar @$locations, 2, "found 2" );
-    like( @$locations[0], qr/file:/, "URIs match" );
-    like( @$locations[1], qr/file:/, "URIs match" );
-    ok( -e _get_file_path( @$locations[0] ), "URI matches file" );
-    ok( -e _get_file_path( @$locations[1] ), "URI matches file" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( $neb->find_instances( "foo" ), undef, "storage object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->find_instances();
-};
-like( $@, qr/1 - 2 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->find_instances( "foo", 'read', 3 );
-};
-like( $@, qr/1 - 2 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/17_client_find.t
===================================================================
--- trunk/Nebulous-Server/t/17_client_find.t	(revision 5665)
+++ 	(revision )
@@ -1,70 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 17_client_find.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 4;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    my $uri = $neb->create( "foo" );
-
-    my $path = $neb->find( "foo" );
-
-    ok( -e $path, "file exists" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    my $path = $neb->find( "foo" );
-
-    ok( ! -e $path, "file doesn't exist" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->find();
-};
-like( $@, qr/1 was expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    $neb->find( "foo", "bar" );
-};
-like( $@, qr/1 was expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/18_client_open.t
===================================================================
--- trunk/Nebulous-Server/t/18_client_open.t	(revision 5665)
+++ 	(revision )
@@ -1,111 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 18_client_open.t,v 1.3 2005-07-28 03:48:41 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 8;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    my $fh = $neb->open( "foo", 'read' );
-
-    is( ref $fh, 'GLOB', "good filehandle" );
-}
-
-Test::Nebulous->setup;
-
-{
-    # key
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    my $fh = $neb->open( "foo", 'write' );
-
-    is( ref $fh, 'GLOB', "good filehandle" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( ref $neb->open( "foo", 'write' ), 'GLOB', "create new object" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( $neb->open( "foo", 'read' ), undef, "can't create new object" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
-
-    is( $neb->open( "foo", 'write' ), undef,
-        "write to object with multiple instances" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->open( "foo", 'bar' );
-};
-like( $@, qr/is read or write/, "2nd params not read or write" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->open();
-};
-like( $@, qr/2 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->open( 1, 'read', 3 );
-};
-like( $@, qr/2 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/19_client_delete.t
===================================================================
--- trunk/Nebulous-Server/t/19_client_delete.t	(revision 5665)
+++ 	(revision )
@@ -1,83 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 19_client_delete.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 7;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->delete( "foo" ), "delete object" );
-
-    my $locations = $neb->find_instances( "foo" );
-
-    is( $locations, undef, "no instances" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
-
-    ok( $neb->delete( "foo" ), "delete object" );
-
-    my $locations = $neb->find_instances( "foo" );
-
-    is( $locations, undef, "no instances" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    is( $neb->delete( "foo" ), undef, "delete non-existant object" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->delete();
-};
-like( $@, qr/1 was expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->delete( "foo", 2 );
-};
-like( $@, qr/1 was expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/20_client_copy.t
===================================================================
--- trunk/Nebulous-Server/t/20_client_copy.t	(revision 5665)
+++ 	(revision )
@@ -1,83 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 20_client_copy.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 8;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->copy( "foo", "foobar" ), "copied object" );
-
-    my $locations1 = $neb->find_instances( "foobar" );
-    my $locations2 = $neb->find_instances( "foobar" );
-
-    is( scalar @$locations1, 1, "old object has an instances" );
-    is( scalar @$locations2, 1, "new object has an instances" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    ok( ! $neb->copy( "foo", "foobar" ), "copy non-existant object" );
-
-    my $locations = $neb->find_instances( "foobar" );
-
-    is( $locations, undef, "new object has no instances" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->copy();
-};
-like( $@, qr/2 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->copy( "foo" );
-};
-like( $@, qr/2 were expected/, "not enough params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->copy( "foo", "bar", "baz" );
-};
-like( $@, qr/2 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/21_client_move.t
===================================================================
--- trunk/Nebulous-Server/t/21_client_move.t	(revision 5665)
+++ 	(revision )
@@ -1,83 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 21_client_move.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 8;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    ok( $neb->move( "foo", "foobar" ), "move object" );
-
-    my $locations1 = $neb->find_instances( "foo" );
-    my $locations2 = $neb->find_instances( "foobar" );
-
-    is( $locations1, undef, "old object has no instances" );
-    is( scalar @$locations2, 1, "new object has an instances" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-
-    ok( ! $neb->move( "foo", "foobar" ), "move non-existant object" );
-
-    my $locations = $neb->find_instances( "foobar" );
-
-    is( $locations, undef, "new object has no instances" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->move();
-};
-like( $@, qr/2 were expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->move( "foo" );
-};
-like( $@, qr/2 were expected/, "not enough params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->move( "foo", "bar", "baz" );
-};
-like( $@, qr/2 were expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/22_client_delete_instance.t
===================================================================
--- trunk/Nebulous-Server/t/22_client_delete_instance.t	(revision 5665)
+++ 	(revision )
@@ -1,92 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 22_client_delete_instance.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 9;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    my $locations = $neb->find_instances( "foo" );
-
-    my $uri = $neb->delete_instance( @$locations[0] );
-
-    is( $uri, @$locations[0], "delete instance" );
-
-    ok( ! -e _get_file_path( @$locations[0] ), "deleted file" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
-
-    my $uri1 = $neb->find_instances( "foo" )->[0];
-
-    ok( $neb->delete_instance( $uri1 ), "delete instance" );
-
-    my $uri2 = $neb->find_instances( "foo" )->[0];
-
-    isnt( $uri1, $uri2, "other instance remains" );
-
-    ok( $neb->delete_instance( $uri2 ), "delete instance" );
-
-    my $locations = $neb->find_instances( "foo" );
-
-    is( $locations, undef, "no remaning instances" );
-}
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    my $uri = $neb->delete_instance( "file:/foo" );
-
-    is( $uri, undef, "uri does not exist" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->delete_instance();
-};
-like( $@, qr/1 was expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->delete_instance( "foo", 2 );
-};
-like( $@, qr/1 was expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/23_client_stat.t
===================================================================
--- trunk/Nebulous-Server/t/23_client_stat.t	(revision 5665)
+++ 	(revision )
@@ -1,87 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 23_client_stat.t,v 1.4 2005-11-10 21:30:32 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-plan tests => 13;
-
-use lib qw( ./t ./lib );
-
-use Nebulous::Client;
-use Nebulous::Util qw( :standard );
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo" );
-
-    my $info = $neb->stat( "foo" );
-
-    is( scalar @$info, 8, "number of columns" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->create( "foo", 0, "node01", "foobar" );
-
-    my $info = $neb->stat( "foo" );
-
-    is( scalar @$info, 8,                       "number of columns" );
-    is( @$info[0], 1,                           "so_id" );
-    is( @$info[1], "foo",                       "ext_id" );
-    is( @$info[2], 0,                           "class_id" );
-    is( @$info[3], "foobar",                    "comment" );
-    is( @$info[4], 0,                           "read lock" );
-    is( @$info[5], undef,                       "write lock" );
-    like( @$info[6], qr/....-..-.. ..:..:../,   "epoch" );
-    like( @$info[6], qr/....-..-.. ..:..:../,   "mtime" );
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    my $info = $neb->stat( "foo" );
-
-    is( $info, undef, "object does not exist" );
-}
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->stat();
-};
-like( $@, qr/1 was expected/, "no params" );
-
-Test::Nebulous->setup;
-
-eval {
-    my $neb = Nebulous::Client->new(
-        proxy => "http://$hostport/nebulous",
-    );
-    $neb->stat( "foo", 2 );
-};
-like( $@, qr/1 was expected/, "too many params" );
-
-Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/24_nebclient.t
===================================================================
--- trunk/Nebulous-Server/t/24_nebclient.t	(revision 5665)
+++ 	(revision )
@@ -1,25 +1,0 @@
-#!/usr/bin/perl
-
-# Copryight (C) 2004-2005  Joshua Hoblitt
-#
-# $Id: 24_nebclient.t,v 1.1 2005-07-28 01:09:35 jhoblitt Exp $
-
-use strict;
-use warnings FATAL => qw( all );
-
-use Apache::Test qw( -withtestmore );
-
-use lib qw( ./t ./lib );
-
-use Test::Nebulous;
-
-my $hostport = Apache::Test->config->{ 'hostport' };
-
-Test::Nebulous->setup;
-
-$ENV{'NEBULOUS_SERVER'} = "http://" . Apache::Test->config->{ 'hostport' } . "/nebulous";
-
-chdir "./nebclient";
-system "make check";
-
-Test::Nebulous->cleanup;
