fixing tests

examples/unit/cloudfiles_example.rb

@@ -36,10 +36,17 @@ def cloudfiles(config = def_config, backup = def_backup)
 
     before(:each) do
       @cloudfiles = cloudfiles
-      @files = [4,1,3,2].to_a.map { |i| stub(o = {}).name {"aaaaa#{i}"}; o }
-      mock.instance_of(CloudFiles::Container).objects(:prefix => "_kind/_id/_kind-_id.") { @files }
-      stub(CloudFiles::Authentication).new { true }
-
+
+      @files = [4,1,3,2].to_a.map { |i| "aaaaa#{i}" }
+
+      @container = "container"
+
+      stub(@container).objects(:prefix => "_kind/_id/_kind-_id.") { @files }
+      stub(@container).delete_object(anything)
+
+      stub(CloudFiles::Connection).
+        new('_user', '_api_key', true, false).stub!.
+        container('_container') {@container}
     end
 
     it "should check [:keep, :cloudfiles]" do
@@ -49,8 +56,8 @@ def cloudfiles(config = def_config, backup = def_backup)
     end
 
     it "should delete extra files" do
-      mock(CloudFiles::Connection).container("_container").mock!["aaaaa1"].mock!.delete
-      mock(CloudFiles::Connection).container("_container").mock!["aaaaa2"].mock!.delete
+      mock(@container).delete_object('aaaaa1')
+      mock(@container).delete_object('aaaaa2')
       @cloudfiles.send :cleanup
     end
 

lib/astrails/safe/cloudfiles.rb

@@ -2,7 +2,7 @@ module Astrails
   module Safe
     class Cloudfiles < Sink
       MAX_CLOUDFILES_FILE_SIZE = 5368709120
-      
+
       protected
 
       def active?
@@ -42,7 +42,7 @@ def cleanup
         puts "listing files: #{container}:#{base}*" if $_VERBOSE
         cf = CloudFiles::Connection.new(user, api_key, true, service_net) unless $LOCAL
         cf_container = cf.container(container)
-        files = cf_container.objects(:prefix => base)
+        files = cf_container.objects(:prefix => base).sort
         print "DEBUG: Files is #{files.to_s}\n"
 
         cleanup_with_limit(files, keep) do |f|