sauce 0.4.3 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/lib/job.rb

@@ -49,7 +49,10 @@ module Sauce
     # Misnomer: Gets the most recent 100 jobs
     # TODO: Allow/automate paging
     def self.all(options={})
-      responses = JSON.parse @@client["jobs/full"].get
+      url = "jobs"
+      url += "?full=true" if options[:full] #unless options[:id_only]
+      responses = @@client[url].get
+      responses = JSON.parse responses.to_s
       return responses.collect{|response| Sauce::Job.new(response)}
     end
 
@@ -65,7 +68,10 @@ module Sauce
       end
       
       #puts "GET-URL: #{@@client.url}jobs/#{id}"
-      Sauce::Job.new JSON.parse(@@client["jobs/#{id}"].get)
+      response = @@client["jobs/#{id}"].get
+
+      # TODO: Return nil if bad response
+      Sauce::Job.new JSON.parse(response.to_s)
     end
 
     # Creates an instance representing a job.
@@ -75,7 +81,7 @@ module Sauce
 
     # Retrieves the latest information on this job from the Sauce Labs' server
     def refresh!
-      response = JSON.parse @@client["jobs/#{@id}"].get
+      response = JSON.parse @@client["jobs/#{@id}"].get.body
       #puts "\tjob refresh with: #{response}"
       build! response
       self
@@ -83,10 +89,14 @@ module Sauce
 
     # Save/update the current information for the job
     def save
-      response = JSON.parse(@@client["jobs/#{@id}"]. self.to_json, :content_type => :json, :accept => :json)
+      #puts "Saving job:\n -X PUT #{@@client['jobs']}/#{@id} -H 'Content-Type: application/json' -d '#{self.to_json}'"
+      response = @@client["jobs/#{@id}"].put(self.to_json,
+                                             {:content_type => :json,
+                                               :accept => :json}).body
+      JSON.parse(response)
     end
 
-    def self.to_json(options={})
+    def to_json(options={})
       json = {
         :id =>              @id,
         :owner =>           @owner,
@@ -108,7 +118,7 @@ module Sauce
       options[:except].each { |key| json.delete(key) } if options[:except]
       json = json.select { |key,value| options[:only].include? key } if options[:only]
       
-      return json
+      return json.to_json
     end
 
     def delete
@@ -119,6 +129,10 @@ module Sauce
 
     # Sets all internal variables from a hash
     def build!(options)
+      #puts "\tBuild with: #{options.inspect}"
+      # Massage JSON
+      options.each { |key,value| options[key] = false if options[key] == "false" }
+
       @id              = options["id"]
       @owner           = options["owner"]
       @status          = options["status"]

data/lib/rest.rb

@@ -7,7 +7,8 @@ module Sauce
     class BadAccessError < StandardError; end #:nodoc
     class MisconfiguredError < StandardError; end #:nodoc
 
-    attr_accessor :username, :access_key, :client, :ip, :api_url
+    attr_accessor :username, :access_key, :client
+    attr_accessor :protocol, :host, :port, :api_path, :api_version, :ip, :api_url
     attr_accessor :tunnels, :jobs
 
     def initialize(options)
@@ -15,8 +16,14 @@ module Sauce
       @access_key = options[:access_key]
       @ip         = options[:ip]
 
+      @protocol   = options[:protocol] || "http"
+      @host       = options[:host] || "saucelabs.com"
+      @port       = options[:port] || 80
+      @api_path   = options[:api_path] || "rest"
+      @api_version= options[:api_version] || 1
+
       raise MisconfiguredError if @username.nil? or @access_key.nil?
-      @api_url = "https://#{@username}:#{@access_key}@saucelabs.com/api/v1/#{@username}/"
+      @api_url = "#{@protocol}://#{@username}:#{@access_key}@#{@host}:#{@port}/#{@api_path}/v#{@api_version}/#{@username}/"
       @client = RestClient::Resource.new @api_url
 
       @tunnels = Sauce::Tunnel

data/lib/tunnel.rb

@@ -49,7 +49,7 @@ module Sauce
     end
 
     def self.all
-      responses = JSON.parse @@client[:tunnels].get
+      responses = JSON.parse @@client[:tunnels].get.body
       return responses.collect{|response| Sauce::Tunnel.new(response)}
     end
 
@@ -59,7 +59,7 @@ module Sauce
 
     # Creates a new tunnel machine
     def self.create(options)
-      response = JSON.parse @@client[:tunnels].post(options.to_json, :content_type => 'application/json')
+      response = JSON.parse @@client[:tunnels].post(options.to_json, :content_type => 'application/json').body
       #puts response.inspect
       Tunnel.new response
     end
@@ -72,13 +72,13 @@ module Sauce
     # Hits the destroy url for this tunnel, and then refreshes. Keep in mind it takes some time to completely teardown a tunnel.
     def destroy
       close_gateway
-      response = @@client["tunnels/#{@id}"].delete
+      response = @@client["tunnels/#{@id}"].delete.body
       refresh!
     end
 
     # Retrieves the latest information on this tunnel from the Sauce Labs' server
     def refresh!
-      response = JSON.parse @@client["tunnels/#{@id}"].get
+      response = JSON.parse @@client["tunnels/#{@id}"].get.body
       #puts "\Tunnel refresh with: #{response.inspect}"
       build! response
       self
@@ -118,7 +118,7 @@ module Sauce
     # Sauce Labs' server will say hello on port 1025 as a sanity check. If no hello, something is wrong.
     # TODO: Make it say hello on port 1025. Currently a hack.
     def says_hello?(options={})
-      return false unless self.status == "running"
+      return false unless self.status == "running" and not @host.nil?
 
       # TODO: Read from options if necessary
       connection = {}
@@ -128,8 +128,6 @@ module Sauce
       connection[:telnet_mode] = true
       connection[:timeout]     = 10
 
-      #puts "telnet: #{connection.inspect}"
-
       host = Net::Telnet::new("Host"       => connection[:host],
                               "Port"       => connection[:port],
                               "Prompt"     => connection[:prompt],
@@ -199,22 +197,41 @@ module Sauce
       not @thread.nil?
     end
 
+    # Returns a json representation of the current state of the tunnel object
+    def to_json(options={})
+      json = {
+        :id =>              @id,
+        :owner =>           @owner,
+        :status =>          @status,
+        :host =>            @host,
+        :creation_time =>   @creation_time,
+        :start_time =>      @start_time,
+        :end_time =>        @end_time,
+        :domain_name =>     @domain_names
+      }
+
+      options[:except].each { |key| json.delete(key) } if options[:except]
+      json = json.select { |key,value| options[:only].include? key } if options[:only]
+      
+      return json
+    end
+
     protected 
 
     # Sets all internal variables from a hash
     def build!(options)
+      options = options["tunnel"] unless options["tunnel"].nil?
       #puts "\tBuild with #{options.inspect}"
-      @status = options["Status"]
-      @owner  = options["Owner"]
-      @id     = options["_id"]
-      @id     = options["id"] if @id.nil? or @id.empty?
-      @host   = options["Host"]
-      @created_at = options["CreationTime"]
-      @updated_at = options["ModificationTime"]
-      @launch_time = options["LaunchTime"]
-      @domain_names = options["DomainNames"]
-
-      raise NoIDError if @id.nil? or @id.empty?
+      @status = options["status"]
+      @owner  = options["owner"]
+      @id     = options["id"]
+      @host   = options["host"]
+      @creation_time = options["creation_time"]
+      @start_time = options["start_time"]
+      @end_time = options["end_time"]
+      @domain_names = options["domain_names"]
+
+      raise NoIDError if @id.nil?
     end
   end
 end

data/test/debug.rb

@@ -1,34 +1,11 @@
-require 'irb_boot'
+require 'helper'
 
 c = Sauce::Client.new(:username => "sgrove",
-                      :access_key => "733a44e2-4226-488f-8126-6f6d59bdf386",
-                      :ip => "67.188.3.10")
-
-=begin
-t = c.tunnels.first
+                      :access_key => "4c592ce3-8f45-4cd6-8e3e-65b9f0b173d0")
 
 c.destroy_all_tunnels
 t = c.create_tunnel('DomainNames' => ["111.111.111.111"])
 
 puts c.tunnels.inspect
-=end
-
-t = c.tunnels.first
-
-if t.nil?
-  puts "Starting a new tunnel"
-  t = c.tunnels.create("DomainNames" => ["sgrove.tst"])
-  until t.status == "running"
-    print "." ; STDOUT.flush
-    t.refresh!
-    sleep 1
-  end
-end
 
-puts t.inspect
-t.open_gateway
-
-puts "Checking to see if thread is running."
-puts t.still_running?
-puts t.thread.inspect
-t.thread.join if t.still_running?
+c.destroy_all_tunnels

data/test/monitor_jobs.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'yaml'
+$: << "../lib/"
+require 'sauce'
+
+account = YAML.load_file("account.yml")
+
+client = Sauce::Client.new(:username => account["username"],
+                           :access_key => account["access_key"])
+
+jobs = client.jobs.all
+
+puts jobs.inspect

data/test/test_jobs.rb

@@ -1,20 +1,27 @@
 require 'helper'
 require 'json'
+require 'yaml'
 
 class TestSauce < Test::Unit::TestCase
   context "A V1 jobs instance" do
     setup do
       # Create this file and put in your details to run the tests
-      account = YAML.load_file "live_account.yml"
+      account = YAML.load_file "account2.yml"
       @username = account["username"]
       @access_key = account["access_key"]
       @ip = account["ip"]
       @client = Sauce::Client.new(:username => @username,
-                                  :access_key => @access_key)
-
-      @example_data = YAML.load_file('example_data.yml')
-    end    
+                                  :access_key => @access_key,
+                                  :protocol => account["protocol"],
+                                  :host => account["host"],
+                                  :port => account["port"],
+                                  :api_path => account["api_path"],
+                                  :api_version => account["api_version"])
+
+      #@example_data = YAML.load_file('example_data.yml')
+    end
 
+=begin
     should "initialize with passed variables" do
       client = Sauce::Client.new(:username => "test_user",
                                  :access_key => "abc123")
@@ -24,7 +31,7 @@ class TestSauce < Test::Unit::TestCase
       assert_equal "501aca56282545a9a21ad2fc592b03fa", job.id
       assert_equal "joe", job.owner
       assert_equal "complete", job.status
-      assert_equal "job-name", job.name 
+      assert_equal "job-example-fixture", job.name 
 
       assert_equal "firefox", job.browser
       assert_equal "3.5.", job.browser_version
@@ -40,55 +47,56 @@ class TestSauce < Test::Unit::TestCase
       assert_equal false, job.public
       assert_equal ["test", "example", "python_is_fun"], job.tags
     end
+=end
 
-    # Note: This won't pass until we have a canonical "test job" and its data
+    # Note: Relies on server-side data fixture
     should "retrieve and parse a job via the api" do
-      job = @client.jobs.find("501aca56282545a9a21ad2fc592b03fa")
+      job = @client.jobs.find("gem-test-job")
 
-      assert_equal "501aca56282545a9a21ad2fc592b03fa", job.id
-      assert_equal "joe", job.owner
+      assert_equal "gem-test-job", job.id
+      assert_equal "sah", job.owner
       assert_equal "complete", job.status
-      assert_equal "job-name", job.name 
+      assert_equal "job-example-fixture", job.name
 
-      assert_equal "firefox", job.browser
+      assert_equal "Firefox", job.browser
       assert_equal "3.5.", job.browser_version
       assert_equal "Windows 2003", job.os
 
-      assert_equal 1253856281, job.creation_time
-      assert_equal 1253856366, job.start_time
-      assert_equal 1253856465, job.end_time 
+      assert_equal 1266030817, job.creation_time
+      assert_equal 1266030833, job.start_time
+      assert_equal 1266030871, job.end_time 
 
-      assert_equal "http://saucelabs.com/video/8b6bf8d360cc338cc7cf7f6e093264d0/video.flv", job.video_url
-      assert_equal "http://saucelabs.com/video/8b6bf8d360cc338cc7cf7f6e093264d0/selenium-server.log", job.log_url
+      assert_equal "http://saucelabs.com/jobs/gem-test-job/video.flv", job.video_url
+      assert_equal "http://saucelabs.com/jobs/gem-test-job/selenium-server.log", job.log_url
 
       assert_equal false, job.public
-      assert_equal ["test", "example", "python_is_fun"], job.tags
+      assert_equal ['test', 'equal', 'multilingualism is fun'], job.tags
     end
 
     should "update writable properties" do
-      job = @client.jobs.find("501aca56282545a9a21ad2fc592b03fa")
+      job = @client.jobs.find("gem-test-job")
 
       # Make sure it's in the expected condition before changing
       assert_equal false, job.public
-      assert_equal ["test", "example", "python_is_fun"], job.tags
-      assert_equal "job-name", job.name
+      assert_equal ["test", "equal", "multilingualism is fun"], job.tags
+      assert_equal "job-example-fixture", job.name
 
       job.public = true
       job.tags = ["changed", "updated", "ruby_is_also_fun"]
-      job.name = "changed-job-name", job.name
+      job.name = "changed-job-name"
       job.save
 
       # Fresh copy of the same job
-      job2 = @client.jobs.find("501aca56282545a9a21ad2fc592b03fa")
+      job2 = @client.jobs.find("gem-test-job")
 
-      assert_equal true, job.public
-      assert_equal ["changed", "updated", "ruby_is_also_fun"], job.tags
-      assert_equal "changed-job-name", job.name
+      assert_equal true, job2.public
+      assert_equal ["changed", "updated", "ruby_is_also_fun"], job2.tags
+      assert_equal "changed-job-name", job2.name
 
       # Return the job to its original state and check it out
       job.public = false
-      job.tags = ["test", "example", "python_is_fun"]
-      job.name = "job-name", job.name
+      job.tags = ["test", "example", "multilingualism is fun"]
+      job.name = "job-example-fixture"
       job.save
 
       # Check to see if the change took
@@ -99,40 +107,39 @@ class TestSauce < Test::Unit::TestCase
     end
 
     should "not update read-only properties" do
-      job = @client.jobs.find("501aca56282545a9a21ad2fc592b03fa")
+      job = @client.jobs.find("gem-test-job")
 
       # Make sure it's in the expected condition before changing
       assert_equal "complete", job.status
-      assert_equal "joe", job.owner
-      assert_equal "Linux", job.os
+      assert_equal "sah", job.owner
+      assert_equal "Windows 2003", job.os
 
       job.status = "groggy"
       job.owner = "sjobs"
       job.os = "darwin" # In a perfect world...
       assert_equal "groggy", job.status
-      assert_equal "joe", job.owner
+      assert_equal "sjobs", job.owner
       assert_equal "darwin", job.os
       job.save
 
       # Changes should go away when refreshed
       job.refresh!
       assert_equal "complete", job.status
-      assert_equal "joe", job.owner
-      assert_equal "Linux", job.os
+      assert_equal "sah", job.owner
+      assert_equal "Windows 2003", job.os
     end
 
     should "list the 100 most recent jobs" do
       jobs = @client.jobs.all
 
-      assert_equal 5, jobs.count
+      assert_equal 2, jobs.count
     end
 
-    should "show the full job information on index if requested" do
+    should "show job listings with full job information if requested" do
       flunk "TODO: implement this"
     end
 
     def teardown
-      @client.tunnels.destroy
     end
   end
 end

data/test/test_tunnels.rb

@@ -1,22 +1,29 @@
 require 'helper'
+require 'yaml'
 
 class TestSauce < Test::Unit::TestCase
   context "A V1 tunnel instance" do
     setup do
       # Create this file and put in your details to run the tests
-      account = YAML.load_file "live_account.yml"
+      account = YAML.load_file "account2.yml"
       @username = account["username"]
       @access_key = account["access_key"]
       @ip = account["ip"]
       @client = Sauce::Client.new(:username => @username,
-                                  :access_key => @access_key)
+                                  :access_key => @access_key,
+                                  :ip => @ip,
+                                  :protocol => account["protocol"],
+                                  :host => account["host"],
+                                  :port => account["port"])
+
+      #STDOUT.puts @client.api_url
       @client.tunnels.destroy_all
     end
 
     should "initialize with passed variables" do
       client = Sauce::Client.new(:username => "test_user",
                                  :access_key => "abc123")
-      assert_equal "https://test_user:abc123@saucelabs.com/api/v1/test_user/", client.api_url
+      assert_equal "http://test_user:abc123@saucelabs.com:80/rest/v1/test_user/", client.api_url
     end
 
     should "create a tunnel with the current user" do
@@ -26,6 +33,14 @@ class TestSauce < Test::Unit::TestCase
       assert_equal @username, tunnel.owner
     end
 
+    should "error if a tunnel is created without domain names" do
+      flunk "TODO: Implement this"
+      tunnel = @client.tunnels.create('DomainNames' => [])
+      tunnel.refresh!
+      assert_not_nil tunnel
+      assert_equal @username, tunnel.owner
+    end
+
     should "list current tunnels" do
       @client.tunnels.create('DomainNames' => ["192.168.0.111"])
       @client.tunnels.create('DomainNames' => ["192.168.0.112"])
@@ -38,7 +53,7 @@ class TestSauce < Test::Unit::TestCase
     should "destroy a tunnel" do
       tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.114"])
       tunnel.destroy
-      assert_equal "halting", tunnel.status
+      assert ["terminated", "halting"].include?(tunnel.status)
     end
 
     should "destroy all tunnels" do
@@ -49,12 +64,15 @@ class TestSauce < Test::Unit::TestCase
       @client.tunnels.destroy_all
 
       @client.tunnels.all.each do |tunnel|
-        assert_equal "halting", tunnel.status
+        # This could be failing because the tunnels are already dead. Our servers too fast?
+        tunnel.refresh!
+        assert ["terminated", "halting"].include? tunnel.status
       end
     end
 
     should "say hello on port 1025 if healthy" do
-      tunnel = @client.tunnels.create('DomainNames' => [@ip])
+      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.118"])
+
 
       max_retries = 30
       retries = 0
@@ -69,8 +87,26 @@ class TestSauce < Test::Unit::TestCase
       tunnel.destroy # cleanup
     end
 
+    should "have a host if finished booting" do
+      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.119"])
+
+      max_retries = 30
+      retries = 0
+      until tunnel.status == "running" or retries >= max_retries
+        sleep 5
+        retries += 1
+        tunnel.refresh!
+      end
+
+      tunnel.refresh!
+
+      assert_not_nil tunnel.host
+
+      tunnel.destroy # cleanup
+    end
+
     should "not attempt to telnet if status is not running" do
-      tunnel = @client.tunnels.create('DomainNames' => [@ip])
+      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.119"])
 
       tunnel.status = "booting"
       assert_equal false, tunnel.says_hello?

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Sean Grove
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -08:00
+date: 2010-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: A ruby interface to Sauce Labs' services. Start/stop tunnels, retrieve Selenium logs, access video replays, etc.
 email: sean@saucelabs.com
 executables: []
@@ -69,26 +78,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby access to Sauce Labs' features
 test_files: 
 - test/debug.rb
 - test/helper.rb
-- test/irb_boot.rb
+- test/monitor_jobs.rb
 - test/test_jobs.rb
-- test/test_jobs_old.rb
 - test/test_tunnels.rb
-- test/test_videos.rb

data/test/irb_boot.rb

@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'net/telnet'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'sauce'

data/test/test_jobs_old.rb

@@ -1,58 +0,0 @@
-require 'helper'
-require 'json'
-
-class TestSauce < Test::Unit::TestCase
-  context "A jobs instance" do
-    setup do
-      # Create this file and put in your details to run the tests
-      account = YAML.load_file "live_account.yml"
-      @username = account["username"]
-      @access_key = account["access_key"]
-      @ip = account["ip"]
-      @client = Sauce::Client.new(:username => @username,
-                                  :access_key => @access_key)
-    end    
-
-    should "initialize with passed variables" do
-      job_json = JSON.parse '{"BrowserVersion": "3.", "Name": "example_job/name.rb", "_rev": "5-228269313", "CreationTime": 1266698090, "AssignmentTime": 1266698097, "Server": "192.168.0.1:4443", "AssignedTo": "f663372ba04444ce8cb3e6f61503f304", "ChefStartTime": 1266698101, "EndTime": 1266698139, "Type": "job", "Interactive": "true", "Status": "complete", "SeleniumServerLogUploadRequest": {"bucket": "sauce-userdata", "key": "sgrove/6337fe576deba0ba278dc1b5dfceac5f/selenium-server.log"}, "Tags": ["tag_1", "tag_2"], "ResultId": "6337fe576deba0ba278dc1b5dfceac5f", "AttachmentRequests": {}, "ModificationTime": 1266698139, "Browser": "firefox", "StartTime": 1266698101, "Owner": "sgrove", "_id": "01fc48caba6d15b46fad79e1b0562bbe", "OS": "Linux", "VideoUploadRequest": {"bucket": "sauce-userdata", "key": "sgrove/6337fe576deba0ba278dc1b5dfceac5f/video.flv"}}'
-
-      client = Sauce::Client.new(:username => "test_user",
-                                 :access_key => "abc123")
-      
-      job = client.jobs.new(job_json)
-
-      assert_equal "sgrove", job.owner
-      assert_equal "01fc48caba6d15b46fad79e1b0562bbe", job.id
-      assert_equal "example_job/name.rb", job.name 
-      assert_equal "5-228269313", job._rev 
-      assert_equal "192.168.0.1:4443", job.server
-      assert_equal "f663372ba04444ce8cb3e6f61503f304", job.assigned_to 
-
-      assert_equal "job", job.sauce_type
-      assert_equal "true", job.interactive
-      assert_equal "complete", job.status
-      assert_equal ["tag_1", "tag_2"], job.tags
-      assert_equal "6337fe576deba0ba278dc1b5dfceac5f", job.result_id
-
-      # TODO: Buckets
-      #assert_equal , job.selenium_server_log_upload_request 
-      #assert_equal , job.attachment_requests 
-      #assert_equal , job.videoupload_request
-
-      assert_equal "Linux", job.os
-      assert_equal "firefox", job.browser
-      assert_equal "3.", job.browser_version
-
-      assert_equal 1266698090, job.creation_time
-      assert_equal 1266698097, job.assignment_time
-      assert_equal 1266698101, job.chef_start_time
-      assert_equal 1266698139, job.end_time 
-      assert_equal 1266698139, job.modification_time
-      assert_equal 1266698101, job.start_time
-    end
-
-    def teardown
-      @client.tunnels.destroy
-    end
-  end
-end

data/test/test_videos.rb

@@ -1,83 +0,0 @@
-require 'helper'
-
-class TestSauce < Test::Unit::TestCase
-  context "A Client instance" do
-    setup do
-      # Create this file and put in your details to run the tests
-      account = YAML.load_file "live_account.yml"
-      @username = account["username"]
-      @access_key = account["access_key"]
-      @ip = account["ip"]
-      @client = Sauce::Client.new(:username => @username,
-                                  :access_key => @access_key)
-      @client.tunnels.destroy
-    end
-
-    should "initialize with passed variables" do
-      client = Sauce::Client.new(:username => "test_user",
-                                 :access_key => "abc123")
-      assert_equal client.api_url, "https://test_user:abc123@saucelabs.com/rest/test_user/"
-    end
-
-    should "create a tunnel with the current user" do
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.110"])
-      tunnel.refresh!
-      assert_not_nil tunnel
-      assert_equal @username, tunnel.owner
-    end
-
-    should "list current tunnels" do
-      @client.tunnels.create('DomainNames' => ["192.168.0.111"])
-      @client.tunnels.create('DomainNames' => ["192.168.0.112"])
-      @client.tunnels.create('DomainNames' => ["192.168.0.113"])
-
-      tunnels = @client.tunnels.all
-      assert_equal 3, tunnels.select{|t| t.status != "halting"}.count
-    end
-
-    should "destroy a tunnel" do
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.114"])
-      tunnel.destroy
-      assert_equal "halting", tunnel.status
-    end
-
-    should "destroy all tunnels" do
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.115"])
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.116"])
-      tunnel = @client.tunnels.create('DomainNames' => ["192.168.0.117"])
-
-      @client.tunnels.destroy
-
-      @client.tunnels.all.each do |tunnel|
-        assert_equal "halting", tunnel.status
-      end
-    end
-
-    should "say hello on port 1025 if healthy" do
-      tunnel = @client.tunnels.create('DomainNames' => [@ip])
-
-      max_retries = 30
-      retries = 0
-      until tunnel.status == "running" or retries >= max_retries
-        sleep 5
-        retries += 1
-        tunnel.refresh!
-      end
-
-      assert_equal true, tunnel.says_hello?
-
-      tunnel.destroy # cleanup
-    end
-
-    should "not attempt to telnet if status is not running" do
-      tunnel = @client.tunnels.create('DomainNames' => [@ip])
-
-      tunnel.status = "booting"
-      assert_equal false, tunnel.says_hello?
-    end
-
-    def teardown
-      @client.tunnels.destroy
-    end
-  end
-end