Changeset 13180 for trunk/Nebulous/t

Timestamp:

May 2, 2007, 5:21:28 PM (19 years ago)

Author:

jhoblitt

Message:

overhaul Nebulous::Client->cull()
add the number of instances to ->stat_object()

Location:

trunk/Nebulous/t

Files:

• 09_server_stat_object.t (modified) (6 diffs)
• 53_client_cull.t (modified) (5 diffs)

trunk/Nebulous/t/09_server_stat_object.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.10 2007-05-01 02:52:04 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.11 2007-05-03 03:21:28 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 11;
+use Test::More tests => 12;
 
 use lib qw( ./t ./lib );
@@ -23 +23 @@
 
 Test::Nebulous->setup;
-
 {
-    my $uri = $neb->create_object("foo");
+    $neb->create_object("foo");
 
     my $info = $neb->stat_object("foo");
 
-    is(scalar @$info, 6, "number of columns");
+    is(scalar @$info, 7, "number of columns");
 }
 
@@ -35 +34 @@
 
 {
-    my $uri = $neb->create_object("foo", "node01");
+    $neb->create_object("foo", "node01");
 
     my $info = $neb->stat_object("foo");
 
-    is(scalar @$info, 6,                       "number of columns");
+    is(scalar @$info, 7,                       "number of columns");
     is(@$info[0], 1,                           "so_id");
     is(@$info[1], "foo",                       "ext_id");
@@ -46 +45 @@
     like(@$info[4], qr/....-..-.. ..:..:../,   "epoch");
     like(@$info[5], qr/....-..-.. ..:..:../,   "mtime");
+    is(@$info[6], 1,                           "instances");
 }
 
@@ -53 +53 @@
     $neb->stat_object("foo");
 };
-like($@, qr/no storage object found/, "object does not exist");
+like($@, qr/is valid object key/, "object does not exist");
 
 Test::Nebulous->setup;
@@ -65 +65 @@
 
 eval {
+    $neb->create_object("foo");
     $neb->stat_object("foo", 2);
 };

trunk/Nebulous/t/53_client_cull.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 53_client_cull.t,v 1.4 2007-05-03 01:53:20 jhoblitt Exp $
+# $Id: 53_client_cull.t,v 1.5 2007-05-03 03:21:28 jhoblitt Exp $
 
 use strict;
@@ -14 +14 @@
 use lib qw( ./t ./lib );
 
-use Nebulous::Client trace => 'debug';
+use Nebulous::Client;
 use Nebulous::Util qw( :standard );
 use Test::Nebulous;
@@ -27 +27 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
+    $neb->create("foo");
+    $neb->replicate("foo");
 
-    my $uri = $neb->cull( "foo" );
+    my $uri = $neb->cull("foo");
 
-    ok( $uri, "good cull" );
-    ok( ! -e _get_file_path( $uri ), "file doesn't exist" );
+    ok($uri, "good cull");
+    ok(! -e _get_file_path($uri), "file doesn't exist");
 }
 
@@ -39 +39 @@
 
 {
-
     # key, $volume
     my $neb = Nebulous::Client->new(
         proxy => "http://$hostport/nebulous",
     );
-    $neb->create( "foo" );
-    $neb->replicate( "foo", "node01" );
+    $neb->create("foo");
+    $neb->replicate("foo", "node01");
 
-    my $uri = $neb->cull( "foo", "node01" );
+    my $uri = $neb->cull("foo", "node01");
 
-    ok( $uri, "good cull" );
-    ok( ! -e _get_file_path( $uri ), "file exists" );
+    ok($uri, "good cull");
+    ok(! -e _get_file_path($uri), "file exists");
 }
 
@@ -60 +59 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->create( "foo" );
+    $neb->create("foo");
 
-    $neb->replicate( "foo", "node01" );
-    $neb->replicate( "foo", "node02" );
+    $neb->replicate("foo", "node01");
+    $neb->replicate("foo", "node02");
 
-    my $uri1 = $neb->cull( "foo" );
-    my $uri2 = $neb->cull( "foo" );
+    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" );
+    ok($uri1, "good cull");
+    ok($uri2, "good cull");
+    ok(! -e _get_file_path($uri1), "file exists");
+    ok(! -e _get_file_path($uri2), "file exists");
 }