bookie_accounting 2.0.0 → 2.0.1

data/spec/database/job_summary_spec.rb

@@ -18,8 +18,7 @@ describe Bookie::Database::JobSummary do
               :command_name => command_name,
               :date => date,
               :cpu_time => 0,
-              :memory_time => 0,
-              :successful => 0
+              :memory_time => 0
             )
           end
         end
@@ -39,79 +38,79 @@ describe Bookie::Database::JobSummary do
   it "correctly filters by date range" do
     d = Date.new(2012)
     sums = JobSummary
-    sums.by_date_range(d .. d).count.should eql sums.by_date(d).count
-    sums.by_date_range(d ... d).count.should eql 0
-    sums.by_date_range(d + 1 .. d).count.should eql 0
-    sums.by_date_range(d .. d + 1).count.should eql sums.by_date(d).count + sums.by_date(d + 1).count
-    sums.by_date_range(d ... d + 1).count.should eql sums.by_date(d).count
+    expect(sums.by_date_range(d .. d).count).to eql sums.by_date(d).count
+    expect(sums.by_date_range(d ... d).count).to eql 0
+    expect(sums.by_date_range(d + 1 .. d).count).to eql 0
+    expect(sums.by_date_range(d .. d + 1).count).to eql sums.by_date(d).count + sums.by_date(d + 1).count
+    expect(sums.by_date_range(d ... d + 1).count).to eql sums.by_date(d).count
   end
-  
+
   it "correctly filters by user" do
     u = User.first
     sums = JobSummary.by_user(u).to_a
-    sums.length.should eql 16
+    expect(sums.length).to eql 16
     sums.each do |sum|
-      sum.user.should eql u
+      expect(sum.user).to eql u
     end
   end
-  
+
   it "correctly filters by user name" do
     sums = JobSummary.by_user_name('test').to_a
-    sums.length.should eql 32
+    expect(sums.length).to eql 32
     sums.each do |sum|
-      sum.user.name.should eql 'test'
+      expect(sum.user.name).to eql 'test'
     end
   end
-  
+
   it "correctly filters by group" do
-    g = Group.find_by_name('admin')
+    g = Group.find_by(name: 'admin')
     sums = JobSummary.by_group(g).to_a
-    sums.length.should eql 32
+    expect(sums.length).to eql 32
     sums.each do |sum|
-      sum.user.group.should eql g
+      expect(sum.user.group).to eql g
     end
   end
-  
+
   it "correctly filters by group name" do
     sums = JobSummary.by_group_name('admin').to_a
-    sums.length.should eql 32
+    expect(sums.length).to eql 32
     sums.each do |sum|
-      sum.user.group.name.should eql 'admin'
+      expect(sum.user.group.name).to eql 'admin'
     end
-    JobSummary.by_group_name('fake_group').count.should eql 0
+    expect(JobSummary.by_group_name('fake_group').count).to eql 0
   end
-  
+
   it "correctly filters by system" do
     s = System.first
     sums = JobSummary.by_system(s).to_a
-    sums.length.should eql 16
+    expect(sums.length).to eql 16
     sums.each do |sum|
-      sum.system.should eql s
+      expect(sum.system).to eql s
     end
   end
-  
+
   it "correctly filters by system name" do
     sums = JobSummary.by_system_name('test1').to_a
-    sums.length.should eql 32
+    expect(sums.length).to eql 32
     sums.each do |sum|
-      sum.system.name.should eql 'test1'
+      expect(sum.system.name).to eql 'test1'
     end
   end
-  
+
   it "correctly filters by system type" do
     s = SystemType.first
     sums = JobSummary.by_system_type(s).to_a
-    sums.length.should eql 32
+    expect(sums.length).to eql 32
     sums.each do |sum|
-      sum.system.system_type.should eql s
+      expect(sum.system.system_type).to eql s
     end
   end
-  
+
   it "correctly filters by command name" do
     sums = JobSummary.by_command_name('vi').to_a
-    sums.length.should eql 32
+    expect(sums.length).to eql 32
     sums.each do |sum|
-      sum.command_name.should eql 'vi'
+      expect(sum.command_name).to eql 'vi'
     end
   end
 
@@ -119,7 +118,7 @@ describe Bookie::Database::JobSummary do
     before(:each) do
       JobSummary.delete_all
     end
-    
+
     it "produces correct summaries" do
       d = Date.new(2012)
       range = base_time ... base_time + 1.days
@@ -127,7 +126,7 @@ describe Bookie::Database::JobSummary do
       sums = JobSummary.all.to_a
       found_sums = Set.new
       sums.each do |sum|
-        sum.date.should eql Date.new(2012)
+        expect(sum.date).to eql Date.new(2012)
         jobs = Job.by_user(sum.user).by_system(sum.system).by_command_name(sum.command_name)
         sum_2 = jobs.summary(range)
         [:cpu_time, :memory_time].each do |field|
@@ -136,20 +135,19 @@ describe Bookie::Database::JobSummary do
         found_sums.add([sum.user.id, sum.system.id, sum.command_name])
       end
       #Is it catching all of the combinations of categories?
-      Job.by_time_range(range).select('user_id, system_id, command_name').uniq.find_each do |values|
-        values = [values.user_id, values.system_id, values.command_name]
-        found_sums.include?(values).should eql true
+      Job.by_time_range(range).uniq.pluck(:user_id, :system_id, :command_name).each do |values|
+        expect(found_sums.include?(values)).to eql true
       end
     end
-    
+
     it "creates dummy summaries when there are no jobs" do
       d = Date.new(2012) + 5
       JobSummary.summarize(d)
       sums = JobSummary.by_date(d).to_a
-      sums.length.should eql 1
+      expect(sums.length).to eql 1
       sum = sums[0]
-      sum.cpu_time.should eql 0
-      sum.memory_time.should eql 0
+      expect(sum.cpu_time).to eql 0
+      expect(sum.memory_time).to eql 0
 
       #Check the case where there are no users or no systems:
       JobSummary.delete_all
@@ -157,7 +155,7 @@ describe Bookie::Database::JobSummary do
         JobSummary.transaction(:requires_new => true) do
           klass.delete_all
           JobSummary.summarize(d)
-          JobSummary.by_date(d).count.should eql 0
+          expect(JobSummary.by_date(d).count).to eql 0
           raise ActiveRecord::Rollback
         end
       end
@@ -176,7 +174,7 @@ describe Bookie::Database::JobSummary do
         :memory_time => 0,
       }
     end
-    
+
     it "produces correct summaries" do
       1.upto(3) do |num_days|
         [0, -2.hours, 2.hours, 3.minutes].each do |offset_begin|
@@ -196,11 +194,11 @@ describe Bookie::Database::JobSummary do
     it "distinguishes between inclusive and exclusive ranges" do
       Summary = JobSummary
       sum = Summary.summary(:range => (base_time ... base_time + 1.days + 2.hours))
-      sum[:num_jobs].should eql 26
-      sum[:successful].should eql 13
+      expect(sum[:num_jobs]).to eql 26
+      expect(sum[:successful]).to eql 13
       sum = Summary.summary(:range => (base_time .. base_time + 1.days + 2.hours))
-      sum[:num_jobs].should eql 27
-      sum[:successful].should eql 14
+      expect(sum[:num_jobs]).to eql 27
+      expect(sum[:successful]).to eql 14
     end
 
     def check_time_bounds
@@ -208,7 +206,7 @@ describe Bookie::Database::JobSummary do
       expect(JobSummary.minimum(:date)).to eql(base_time.to_date)
       expect(JobSummary.maximum(:date)).to eql(Time.now.utc.to_date - 1)
     end
-    
+
     it "correctly finds the default time bounds" do
       Time.expects(:now).at_least(0).returns(base_time + 2.days)
       job = Job.order('end_time DESC').first
@@ -216,7 +214,7 @@ describe Bookie::Database::JobSummary do
       job.save!
       check_time_bounds
       JobSummary.delete_all
-      
+
       #Check the case where all systems are decommissioned.
       #TODO: split into a context?
       JobSummary.transaction(:requires_new => true) do
@@ -232,10 +230,10 @@ describe Bookie::Database::JobSummary do
       #TODO: split into a context?
       Job.delete_all
       sum = JobSummary.summary
-      sum.should eql(@empty_summary)
-      JobSummary.any?.should eql false
+      expect(sum).to eql(@empty_summary)
+      expect(JobSummary.any?).to eql false
     end
-    
+
     it "correctly handles filtered summaries" do
       filters = {
         :user_name => 'test',
@@ -250,12 +248,12 @@ describe Bookie::Database::JobSummary do
         expect(sum1).to eql(sum2)
       end
     end
-    
+
     it "correctly handles inverted ranges" do
       t = base_time
-      JobSummary.summary(:range => t .. t - 1).should eql(@empty_summary)
+      expect(JobSummary.summary(:range => t .. t - 1)).to eql(@empty_summary)
     end
-    
+
     it "caches summaries" do
       JobSummary.expects(:summarize)
       range = base_time ... base_time + 1.days
@@ -281,21 +279,21 @@ describe Bookie::Database::JobSummary do
     }
 
     sum = JobSummary.new(fields)
-    sum.valid?.should eql true
-    
+    expect(sum.valid?).to eql true
+
     fields.each_key do |field|
       job = JobSummary.new(fields)
       job.method("#{field}=".intern).call(nil)
-      job.valid?.should eql false
+      expect(job.valid?).to eql false
     end
-    
+
     [:cpu_time, :memory_time].each do |field|
       job = JobSummary.new(fields)
       method = job.method("#{field}=".intern)
       method.call(-1)
-      job.valid?.should eql false
+      expect(job.valid?).to eql false
       method.call(0)
-      job.valid?.should eql true
+      expect(job.valid?).to eql true
     end
   end
 end

data/spec/database/lock_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe Bookie::Database::Lock do
   it "finds locks" do
     Lock = Bookie::Database::Lock
-    Lock[:users].should_not eql nil
-    Lock[:users].name.should eql 'users'
-    Lock[:groups].should_not eql nil
-    Lock[:groups].name.should eql 'groups'
-    expect { Lock[:dummy] }.to raise_error("Unable to find lock 'dummy'")
+    expect(Lock[:users]).to_not eql nil
+    expect(Lock[:users].name).to eql 'users'
+    expect(Lock[:groups]).to_not eql nil
+    expect(Lock[:groups].name).to eql 'groups'
+    expect { Lock[:dummy] }.to raise_error(ActiveRecord::RecordNotFound)
   end
-  
+
   it "locks records (will probably fail if the testing DB doesn't support row locks)" #do
     #lock = Bookie::Database::Lock[:users]
     #thread = nil
@@ -21,21 +21,20 @@ describe Bookie::Database::Lock do
     #        Bookie::Database::User.first
     #      end
     #    end
-    #    (Time.now - t).should >= 0.5
+    #    expect(Time.now - t).to >= 0.5
     #  }
     #  sleep(1)
     #end
     #thread.join
   #end
-  
+
   it "validates fields" do
     lock = Bookie::Database::Lock.new
     lock.name = nil
-    lock.valid?.should eql false
+    expect(lock.valid?).to eql false
     lock.name = ''
-    lock.valid?.should eql false
+    expect(lock.valid?).to eql false
     lock.name = 'test'
-    lock.valid?.should eql true
+    expect(lock.valid?).to eql true
   end
 end
-

data/spec/database/system_spec.rb

@@ -4,43 +4,43 @@ include Bookie::Database
 
 describe Bookie::Database::System do
   describe "#active" do
-    it { System.active.length.should eql 3 }
+    it { expect(System.active.length).to eql 3 }
   end
-  
+
   it "correctly filters by name" do
-    System.by_name('test1').length.should eql 2
-    System.by_name('test2').length.should eql 1
-    System.by_name('test3').length.should eql 1
+    expect(System.by_name('test1').length).to eql 2
+    expect(System.by_name('test2').length).to eql 1
+    expect(System.by_name('test3').length).to eql 1
   end
-  
+
   it "correctly filters by system type" do
     ['Standalone', 'TORQUE cluster'].each do |type|
-      t = SystemType.find_by_name(type)
-      System.by_system_type(t).length.should eql 2
+      t = SystemType.find_by(name: type)
+      expect(System.by_system_type(t).length).to eql 2
     end
   end
 
   #TODO: create a common example.
   describe "#by_time_range" do
     it "correctly filters by time range" do
-      systems = System.by_time_range(base_time ... base_time + 36000 * 2 + 1)
-      systems.count.should eql 3
-      systems = System.by_time_range(base_time + 1 ... base_time + 36000 * 2)
-      systems.count.should eql 2
+      systems = System.by_time_range(base_time ... base_time + 20.hours + 1)
+      expect(systems.count).to eql 3
+      systems = System.by_time_range(base_time + 1 ... base_time + 20.hours)
+      expect(systems.count).to eql 2
       systems = System.by_time_range(base_time ... base_time)
-      systems.length.should eql 0
-      systems = System.by_time_range(base_time .. base_time + 36000 * 2)
-      systems.count.should eql 3
+      expect(systems.length).to eql 0
+      systems = System.by_time_range(base_time .. base_time + 20.hours)
+      expect(systems.count).to eql 3
       systems = System.by_time_range(base_time .. base_time)
-      systems.count.should eql 1
+      expect(systems.count).to eql 1
     end
 
     #TODO: split inclusive/exclusive range tests
-    
+
     it "correctly handles empty/inverted ranges" do
       (-1 .. 0).each do |offset|
         systems = System.by_time_range(base_time ... base_time + offset)
-        systems.count.should eql 0
+        expect(systems.count).to eql 0
       end
     end
   end
@@ -54,7 +54,7 @@ describe Bookie::Database::System do
 
     let(:summary) { create_summaries(System, base_time) }
     let(:summary_wide) { System.summary(base_time - 1.hours ... Time.now + 1.hours) }
-    
+
     #All systems should have the same amount of memory.
     let(:memory_per_system) { System.first.memory }
     let(:cores_per_system) { System.first.cores }
@@ -110,44 +110,44 @@ describe Bookie::Database::System do
         end
 
         s1 = System.summary()
-        s1.should eql summary[:all]
+        expect(s1).to eql summary[:all]
 
         s1 = System.summary(base_time ... Time.now + 1.hour)
         s2 = summary[:all].dup
         s2[:avail_memory_avg] = Float(total_memory_time) / 41.hours
-        s1.should eql s2
+        expect(s1).to eql s2
       end
     end
-    
+
     it "correctly handles inverted ranges" do
       t = base_time
-      System.summary(t ... t - 1).should eql summary[:empty]
-      System.summary(t .. t - 1).should eql summary[:empty]
+      expect(System.summary(t ... t - 1)).to eql summary[:empty]
+      expect(System.summary(t .. t - 1)).to eql summary[:empty]
     end
   end
 
   describe "#find_current" do
     before(:all) do
       @config_t1 = test_config.clone
-      
+
       @config_t1.hostname = 'test1'
       @config_t1.system_type = 'standalone'
       @config_t1.cores = 2
       @config_t1.memory = 1000000
-      
+
       @config_t2 = @config_t1.clone
       @config_t2.system_type = 'torque_cluster'
-      
+
       @sender_1 = Bookie::Sender.new(@config_t1)
       @sender_2 = Bookie::Sender.new(@config_t2)
     end
 
     it "finds the correct system" do
-      System.find_current(@sender_2).id.should eql 2
-      System.find_current(@sender_2, Time.now).id.should eql 2
-      System.find_current(@sender_1, base_time).id.should eql 1
+      expect(System.find_current(@sender_2).id).to eql 2
+      expect(System.find_current(@sender_2, Time.now).id).to eql 2
+      expect(System.find_current(@sender_1, base_time).id).to eql 1
     end
-    
+
     it "correctly detects the lack of a matching system" do
       expect {
         System.find_current(@sender_1, base_time - 1.years)
@@ -157,7 +157,7 @@ describe Bookie::Database::System do
         System.find_current(@sender_1, base_time)
       }.to raise_error(/^There is no system with hostname 'test1000' that was recorded as active at /)
     end
-    
+
     it "correctly detects conflicts" do
       config = test_config.clone
       config.hostname = 'test1'
@@ -172,7 +172,7 @@ describe Bookie::Database::System do
         }.to raise_error(System::SystemConflictError)
         config.unstub(field)
       end
-      sender.expects(:system_type).returns(SystemType.find_by_name("Standalone"))
+      sender.expects(:system_type).returns(SystemType.find_by(name: "Standalone"))
       expect {
         System.find_current(sender)
       }.to raise_error(System::SystemConflictError)
@@ -180,16 +180,16 @@ describe Bookie::Database::System do
   end
 
   it "correctly decommissions" do
-    sys = System.active.find_by_name('test1')
+    sys = System.active.find_by(name: 'test1')
     begin
       sys.decommission(sys.start_time + 3)
-      sys.end_time.should eql sys.start_time + 3
+      expect(sys.end_time).to eql sys.start_time + 3
     ensure
       sys.end_time = nil
       sys.save!
     end
   end
-  
+
   it "validates fields" do
     fields = {
       :name => 'test',
@@ -198,35 +198,34 @@ describe Bookie::Database::System do
       :system_type => SystemType.first,
       :start_time => base_time
     }
-    
-    System.new(fields).valid?.should eql true
-    
+
+    expect(System.new(fields).valid?).to eql true
+
     fields.each_key do |field|
       system = System.new(fields)
       system.method("#{field}=".intern).call(nil)
-      system.valid?.should eql false
+      expect(system.valid?).to eql false
     end
-    
+
     system = System.new(fields)
     system.name = ''
-    system.valid?.should eql false
-    
+    expect(system.valid?).to eql false
+
     [:cores, :memory].each do |field|
       system = System.new(fields)
       m = system.method("#{field}=".intern)
       m.call(-1)
-      system.valid?.should eql false
+      expect(system.valid?).to eql false
       m.call(0)
-      system.valid?.should eql true
+      expect(system.valid?).to eql true
     end
-    
+
     system = System.new(fields)
     system.end_time = base_time
-    system.valid?.should eql true
+    expect(system.valid?).to eql true
     system.end_time += 5
-    system.valid?.should eql true
+    expect(system.valid?).to eql true
     system.end_time -= 10
-    system.valid?.should eql false
+    expect(system.valid?).to eql false
   end
 end
-