testlab 1.4.4 → 1.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODBlNjc1YWRlMDE2YjI5ZDY0YWE5ZTU5M2FhMWJkYWE2Y2FlZTgwYQ==
+  data.tar.gz: !binary |-
+    YTkwZTliNWZjNDE5YzgzN2U2YTY1ZTJkZWFiZWRjNDQ4OWU1MTQ0MQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmUxMDdhOWQ4ZmRiZjBiYWU1NDBhYzFjYjdhNDRkNTBiZmZmODljN2VmMmQ1
+    NWE5NTUwNDUyMjMyNjc3YjUwNmQxYjM4ZDM4NWM3ZTQ2YjRkZTA0M2ZlYWY0
+    NWEyY2IwYmM1MjQ3ZDA5YjhhMDc2Y2YxY2MyOGVmNzVlYTQ2M2Q=
+  data.tar.gz: !binary |-
+    MmQ4ZGUxZGQzMGFkM2MyNWZkYTliYzMzYTMyMGY4YjY4MjRhOWQxZTRhNzNk
+    YzE4YTc4ODliNGRjOWQzOWYyZDE1NWRkYzM2MzY5OTE1ZmZkYTUxMzk2ZjI3
+    NGIxNmRkNWEyNWYyMjNiZDE3YzUxY2FlODg1MDAwYzM2MGE5N2U=

data/features/step_definitions/testlab_steps.rb

@@ -26,6 +26,10 @@ When /^I destroy the lab with "([^"]*)"$/ do |app_name|
   testlab_cmd(app_name, %W(destroy))
 end
 
+When /^I bounce the lab with "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(bounce))
+end
+
 def testlab_cmd(app_name, *args)
   args = args.join(' ')
   step %(I run `#{app_name} --repo=#{TEST_REPO} --labfile=#{TEST_LABFILE} #{args}`)

data/features/support/Labfile.vagrant

@@ -25,6 +25,7 @@ node 'vagrant' do
 
   network 'labnet' do
     provisioners  [
+      TestLab::Provisioner::Route,
       TestLab::Provisioner::Bind
     ]
 
@@ -38,6 +39,7 @@ node 'vagrant' do
 
     provisioners   [
       TestLab::Provisioner::Resolv,
+      TestLab::Provisioner::Bind,
       TestLab::Provisioner::AptCacherNG,
       TestLab::Provisioner::Apt
     ]

data/features/testlab.feature

@@ -25,6 +25,8 @@ Feature: TestLab command-line
     Then the exit status should be 0
     When I export the containers with "tl"
     Then the exit status should be 0
+    When I bounce the lab with "tl"
+    Then the exit status should be 0
 
 
   Scenario: TestLab import
@@ -34,6 +36,8 @@ Feature: TestLab command-line
     Then the exit status should be 0
     When I build the lab with "tl"
     Then the exit status should be 0
+    When I bounce the lab with "tl"
+    Then the exit status should be 0
 
 
   Scenario: TestLab clone
@@ -50,13 +54,13 @@ Feature: TestLab command-line
     Then the exit status should be 0
 
     When I build the containers with "tl"
-    Then the exit status should be 0
+    Then the exit status should be 1
 
     When I bounce the containers with "tl"
     Then the exit status should be 0
 
     When I recycle the containers with "tl"
-    Then the exit status should be 0
+    Then the exit status should be 1
 
     When I bounce the containers with "tl"
     Then the exit status should be 0
@@ -85,6 +89,9 @@ Feature: TestLab command-line
     When I bounce the containers with "tl"
     Then the exit status should be 0
 
+    When I bounce the lab with "tl"
+    Then the exit status should be 0
+
 
   Scenario: TestLab Demolish
     When I demolish the lab with "tl"

data/lib/commands/container.rb

@@ -30,14 +30,10 @@ Displays the status of all containers or single/multiple containers if supplied
 EOF
   c.command :status do |status|
     status.action do |global_options, options, args|
-      containers = iterate_objects_by_name(options[:name], TestLab::Container).delete_if{ |container| container.node.dead? }
+      containers = iterate_objects_by_name(options[:name], TestLab::Container)
 
-      if (containers.count == 0)
-        @testlab.ui.stderr.puts("You either have no containers defined or dead nodes!".yellow)
-      else
-        ZTK::Report.new(:ui => @testlab.ui).list(containers, TestLab::Container::STATUS_KEYS) do |container|
-          OpenStruct.new(container.status)
-        end
+      ZTK::Report.new(:ui => @testlab.ui).list(containers, TestLab::Container::STATUS_KEYS) do |container|
+        OpenStruct.new(container.status)
       end
     end
   end

data/lib/commands/network.rb

@@ -30,14 +30,10 @@ Displays the status of all networks or single/multiple networks if supplied via
 EOF
   c.command :status do |status|
     status.action do |global_options, options, args|
-      networks = iterate_objects_by_name(options[:name], TestLab::Network).delete_if{ |network| network.node.dead? }
+      networks = iterate_objects_by_name(options[:name], TestLab::Network)
 
-      if (networks.count == 0)
-        @testlab.ui.stderr.puts("You either have no networks defined or dead nodes!".yellow)
-      else
-        ZTK::Report.new(:ui => @testlab.ui).list(networks, TestLab::Network::STATUS_KEYS) do |network|
-          OpenStruct.new(network.status)
-        end
+      ZTK::Report.new(:ui => @testlab.ui).list(networks, TestLab::Network::STATUS_KEYS) do |network|
+        OpenStruct.new(network.status)
       end
     end
   end
@@ -56,7 +52,6 @@ EOF
           p = TestLab::Provisioner::Route.new({}, @ui)
           p.on_network_up(network)
           @testlab.ui.stdout.puts("Added routes successfully!".green.bold)
-          @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
         end
       end
     end
@@ -70,23 +65,28 @@ EOF
           p = TestLab::Provisioner::Route.new({}, @ui)
           p.on_network_down(network)
           @testlab.ui.stdout.puts("Deleted routes successfully!".red.bold)
-          @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
         end
       end
     end
 
     # ROUTE SHOW
     #############
+
+    # Route show helper method because OSX sucks
+    def osx_network(net)
+      net.network.split('.').delete_if{ |o| o == '0' }.join('.')
+    end
+
     route.desc 'Show routes to lab networks'
     route.command :show do |show|
       show.action do |global_options,options,args|
         iterate_objects_by_name(options[:name], TestLab::Network) do |network|
-          @testlab.ui.stdout.puts("TestLab routes:".green.bold)
+          @testlab.ui.stdout.puts("Routes for TestLab network '#{network.id}':".green.bold)
           case RUBY_PLATFORM
           when /darwin/ then
-            @testlab.ui.stdout.puts %x(netstat -nrf inet | grep '#{network.node.ip}').strip
+            @testlab.ui.stdout.puts %x(netstat -nrf inet | grep '#{osx_network(network)}/#{network.cidr}').strip
           when /linux/ then
-            @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+            @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.network}').strip
           end
         end
       end

data/lib/testlab/container/actions.rb

@@ -12,8 +12,9 @@ class TestLab
       def create
         @ui.logger.debug { "Container Create: #{self.id}" }
 
-        (self.node.state == :running) or return false
-        (self.state == :not_created) or return false
+        self.node.alive? or return false
+
+        persistent_operation_check(:create)
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           configure
@@ -34,8 +35,7 @@ class TestLab
       def destroy
         @ui.logger.debug { "Container Destroy: #{self.id}" }
 
-        (self.node.state == :running) or return false
-        (self.state != :not_created) or return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           self.lxc.destroy(%(-f))
@@ -55,8 +55,7 @@ class TestLab
       def up
         @ui.logger.debug { "Container Up: #{self.id}" }
 
-        (self.node.state == :running) or return false
-        (self.state != :running) or return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           configure
@@ -66,19 +65,19 @@ class TestLab
             self.node.exec(%(sudo arp --verbose --delete #{interface.ip}), :ignore_exit_status => true)
           end
 
-          if self.lxc_clone.exists?
+          if self.is_ephemeral?
             self.lxc_clone.start_ephemeral(clone_args)
           else
             self.lxc.start(%(--daemon))
           end
 
-          (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
+          (self.state != :running) and raise ContainerError, "The container failed to online!"
 
           ZTK::TCPSocketCheck.new(:ui => @ui, :host => self.primary_interface.ip, :port => 22).wait
 
           # If we are not in ephemeral mode we should attempt to provision our
           # defined users.
-          if !self.lxc_clone.exists?
+          if self.is_persistent?
             self.users.each do |user|
               user.provision
             end
@@ -101,15 +100,14 @@ class TestLab
       def down
         @ui.logger.debug { "Container Down: #{self.id}" }
 
-        (self.node.state == :running) or return false
-        (self.state == :running) or return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
 
           self.lxc.stop
 
           # If we are in ephemeral mode...
-          if self.lxc_clone.exists?
+          if self.is_ephemeral?
 
             # IMPORTANT NOTE:
             #
@@ -118,11 +116,10 @@ class TestLab
             #
             # If we are using a memory backed COW filesystem for the ephemeral
             # clones then it will be released when the container is stopped.
-
             self.persist and self.lxc.destroy(%(-f))
           end
 
-          (self.lxc.state == :running) and raise ContainerError, "The container failed to offline!"
+          (self.state == :running) and raise ContainerError, "The container failed to offline!"
 
           do_provisioner_callbacks(self, :down, @ui)
         end

data/lib/testlab/container/clone.rb

@@ -12,7 +12,7 @@ class TestLab
         @ui.logger.debug { "Container Ephemeral: #{self.id}" }
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Ephemeral', :yellow)) do
-          self.to_ephemeral
+          is_persistent? and self.to_ephemeral
         end
 
         true
@@ -27,12 +27,49 @@ class TestLab
         @ui.logger.debug { "Container Persistent: #{self.id}" }
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Persistent', :yellow)) do
-          self.to_static
+          is_ephemeral? and self.to_persistent
         end
 
         true
       end
 
+      # Persistent Operation Check
+      #
+      # Checks if the container is operating in ephemeral mode, and if it is
+      # raises an exception indicating the operation can not proceed.
+      #
+      # If the container is operating in persistent mode, no output is generated
+      # and true is returned indicating the operation can continue.
+      #
+      # @return [Boolean] True if the operation can continue; false otherwise.
+      def persistent_operation_check(action)
+        if is_ephemeral?
+          raise ContainerError, "You can not #{action} #{self.id} because it is currently in ephemeral mode!"
+        end
+
+        true
+      end
+
+      # Is Container Ephemeral?
+      #
+      # Returns true if the container is in ephemeral mode, false otherwise.
+      #
+      # @return [Boolean] Returns true if the container is ephemeral, false
+      #   otherwise.
+      def is_ephemeral?
+        self.lxc_clone.exists?
+      end
+
+      # Is Container Persistent?
+      #
+      # Returns true if the container is in persistent mode, false otherwise.
+      #
+      # @return [Boolean] Returns true if the container is persistent, false
+      #   otherwise.
+      def is_persistent?
+        !is_ephemeral?
+      end
+
       # LXC::Container object
       #
       # Returns a *LXC::Container* class instance configured for the clone of
@@ -51,8 +88,12 @@ class TestLab
       # occur.
       #
       # @return [Boolean] Returns true if successful.
-      def to_static
-        if self.lxc_clone.exists?
+      def to_persistent
+        if self.is_ephemeral?
+          self_state = self.state
+
+          configure
+
           self.lxc.stop
           self.lxc.destroy(%(-f))
 
@@ -60,7 +101,8 @@ class TestLab
           self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
           self.lxc_clone.destroy(%(-f))
 
-          build_lxc_config(self.lxc.config)
+          # bring our container back online if it was running before the operation
+          (self_state == :running) and self.up
         end
 
         true
@@ -73,7 +115,11 @@ class TestLab
       #
       # @return [Boolean] Returns true if successful.
       def to_ephemeral
-        if (self.lxc.exists? && !self.lxc_clone.exists?)
+        if self.is_persistent?
+          self_state = self.state
+
+          configure
+
           self.lxc_clone.stop
           self.lxc_clone.destroy(%(-f))
 
@@ -81,10 +127,8 @@ class TestLab
           self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
           self.lxc.destroy(%(-f))
 
-          build_lxc_config(self.lxc_clone.config)
-        else
-          self.lxc.stop
-          self.persist and self.lxc.destroy(%(-f))
+          # bring our container back online if it was running before the operation
+          (self_state == :running) and self.up
         end
 
         true

data/lib/testlab/container/io.rb

@@ -11,7 +11,7 @@ class TestLab
       def export(compression=9, local_file=nil)
         @ui.logger.debug { "Container Export: #{self.id} " }
 
-        (self.lxc.state == :not_created) and return false
+        (self.state == :not_created) and raise ContainerError, 'You must create a container before you can export it!'
 
         # Throw an exception if we are attempting to export a container in a
         # ephemeral state.
@@ -49,9 +49,7 @@ EOF
           self.node.download(remote_file, local_file)
         end
 
-        @ui.stdout.puts
-        @ui.stdout.puts("Your shipping container is now exported and available at '#{local_file}'!".green.bold)
-        @ui.stdout.puts
+        @ui.stdout.puts(format_message("Your shipping container is now exported and available at '#{local_file}'!".green.bold))
 
         true
       end
@@ -63,7 +61,7 @@ EOF
         @ui.logger.debug { "Container Import: #{self.id} " }
 
         # Ensure we are not in ephemeral mode.
-        self.to_static
+        self.persistent
 
         self.down
         self.destroy
@@ -97,9 +95,7 @@ du -sh #{self.lxc.container_root}
 EOF
         end
 
-        @ui.stdout.puts
-        @ui.stdout.puts("Your shipping container is now imported and available for use!".green.bold)
-        @ui.stdout.puts
+        @ui.stdout.puts(format_message("Your shipping container is now imported and available for use!".green.bold))
 
         true
       end

data/lib/testlab/container/provision.rb

@@ -5,16 +5,14 @@ class TestLab
 
       # Provision the container
       #
-      # Attempts to provision the container.  We first create the container,
-      # then attempt to bring it online.  Afterwards the containers provisioner
-      # is called.
+      # Attempts to provision the container.  Calls the containers defined
+      # provisioners provision methods.
       #
       # @return [Boolean] True if successful.
       def provision
         @ui.logger.debug { "Container Provision: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, :provision, :green)) do
           do_provisioner_callbacks(self, :provision, @ui)
@@ -25,16 +23,16 @@ class TestLab
 
       # Deprovision the container
       #
-      # Attempts to deprovision the container.  We first call the provisioner
-      # deprovision method defined for the container, if any.  Next we attempt
-      # to offline the container.  Afterwards the container is destroy.
+      # Attempts to deprovision the container.  Calls the containers defined
+      # provisioners deprovision methods.
       #
       # @return [Boolean] True if successful.
       def deprovision
         @ui.logger.debug { "Container Deprovision: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
+        self.node.alive? or return false
+
+        persistent_operation_check(:deprovision)
 
         please_wait(:ui => @ui, :message => format_object_action(self, :deprovision, :red)) do
           do_provisioner_callbacks(self, :deprovision, @ui)

data/lib/testlab/container/status.rb

@@ -70,8 +70,8 @@ class TestLab
       #
       # @return [Symbol] A symbol indicating the state of the container.
       def state
-        if self.lxc_clone.exists?
-          self.lxc_clone.state
+        if self.node.dead?
+          :unknown
         else
           self.lxc.state
         end
@@ -82,10 +82,14 @@ class TestLab
       # What mode the container is in.
       # @return [Symbol] A symbol indicating the mode of the container.
       def mode
-        if self.lxc_clone.exists?
-          :ephemeral
+        if self.node.dead?
+          :unknown
         else
-          :persistent
+          if self.is_ephemeral?
+            :ephemeral
+          else
+            :persistent
+          end
         end
       end
 

data/lib/testlab/network/actions.rb

@@ -7,8 +7,7 @@ class TestLab
       def create
         @ui.logger.debug { "Network Create: #{self.id} " }
 
-        (self.node.state == :running) or return false
-        (self.state == :not_created) or return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
@@ -41,8 +40,7 @@ brctl setfd #{self.bridge} 0
       def destroy
         @ui.logger.debug { "Network Destroy: #{self.id} " }
 
-        (self.node.state == :running) or return false
-        (self.state != :not_created) or return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
@@ -61,8 +59,7 @@ brctl delbr #{self.bridge}
       def up
         @ui.logger.debug { "Network Up: #{self.id} " }
 
-        (self.node.state == :running) or return false
-        # (self.state != :running) or return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
@@ -80,8 +77,7 @@ ifconfig #{self.bridge} #{self.ip} netmask #{self.netmask} broadcast #{self.broa
       def down
         @ui.logger.debug { "Network Down: #{self.id} " }
 
-        (self.node.state == :running) or return false
-        # (self.state == :running) or return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)

data/lib/testlab/network/provision.rb

@@ -7,8 +7,7 @@ class TestLab
       def provision
         @ui.logger.debug { "Network Provision: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Provision', :green)) do
           do_provisioner_callbacks(self, :provision, @ui)
@@ -21,8 +20,7 @@ class TestLab
       def deprovision
         @ui.logger.debug { "Network Deprovision: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
+        self.node.alive? or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Deprovision', :red)) do
           do_provisioner_callbacks(self, :deprovision, @ui)

data/lib/testlab/network/status.rb

@@ -63,15 +63,19 @@ class TestLab
 
       # Network Bridge State
       def state
-        exit_code = self.node.exec(%(sudo brctl show #{self.bridge} 2>&1 | grep -i 'No such device'), :ignore_exit_status => true).exit_code
-        if (exit_code == 0)
-          :not_created
+        if self.node.dead?
+          :unknown
         else
-          output = self.node.exec(%(sudo ifconfig #{self.bridge} 2>&1 | grep 'MTU'), :ignore_exit_status => true).output.strip
-          if ((output =~ /UP/) || (output =~ /RUNNING/))
-            :running
+          exit_code = self.node.exec(%(sudo brctl show #{self.bridge} 2>&1 | grep -i 'No such device'), :ignore_exit_status => true).exit_code
+          if (exit_code == 0)
+            :not_created
           else
-            :stopped
+            output = self.node.exec(%(sudo ifconfig #{self.bridge} 2>&1 | grep 'MTU'), :ignore_exit_status => true).output
+            if ((output =~ /UP/) || (output =~ /RUNNING/))
+              :running
+            else
+              :stopped
+            end
           end
         end
       end

data/lib/testlab/node/actions.rb

@@ -7,8 +7,6 @@ class TestLab
       def create
         @ui.logger.debug { "Node Create: #{self.id} " }
 
-        (self.state == :not_created) or return false
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           @provider.create
 
@@ -22,8 +20,6 @@ class TestLab
       def destroy
         @ui.logger.debug { "Node Destroy: #{self.id} " }
 
-        (self.state != :not_created) or return false
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           @provider.destroy
 
@@ -37,8 +33,6 @@ class TestLab
       def up
         @ui.logger.debug { "Node Up: #{self.id} " }
 
-        (self.state != :running) or return false
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           @provider.up
 
@@ -52,8 +46,6 @@ class TestLab
       def down
         @ui.logger.debug { "Node Down: #{self.id} " }
 
-        (self.state == :running) or return false
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           @provider.down
 

data/lib/testlab/node/provision.rb

@@ -7,8 +7,6 @@ class TestLab
       def provision
         @ui.logger.debug { "Node Provision: #{self.id} " }
 
-        (self.state != :running) and return false
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Provision', :green)) do
           do_provisioner_callbacks(self, :provision, @ui)
         end
@@ -20,8 +18,6 @@ class TestLab
       def deprovision
         @ui.logger.debug { "Node Deprovision: #{self.id} " }
 
-        (self.state != :running) and return false
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Deprovision', :red)) do
           do_provisioner_callbacks(self, :deprovision, @ui)
         end

data/lib/testlab/providers/vagrant.rb

@@ -29,8 +29,6 @@ class TestLab
       # A collection of all states the VM can be in
       ALL_STATES      = (VALID_STATES + INVALID_STATES).flatten
 
-      MSG_NO_LAB      = %(We could not find a test lab!)
-
 ################################################################################
 
       def initialize(config={}, ui=nil)
@@ -50,8 +48,6 @@ class TestLab
 
       # Destroy Vagrant-controlled VM
       def destroy
-        !self.exists? and raise VagrantError, MSG_NO_LAB
-
         self.alive? and self.down
         self.exists? and self.vagrant_cli("destroy", "--force", self.instance_id)
 
@@ -71,8 +67,6 @@ class TestLab
 
       # Halt Vagrant-controlled VM
       def down(*args)
-        !self.exists? and raise VagrantError, MSG_NO_LAB
-
         arguments = (%W(halt #{self.instance_id}) + args).flatten.compact
 
         self.vagrant_cli(*arguments)

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "1.4.4"
+    VERSION = "1.5.0"
   end
 end

data/spec/container_spec.rb

@@ -52,8 +52,10 @@ describe TestLab::Container do
 
     describe "#status" do
       it "should return a hash of status information about the container" do
+        subject.node.stub(:state) { :running }
         subject.lxc.stub(:state) { :not_created }
         subject.lxc_clone.stub(:exists?) { false }
+
         subject.status.should be_kind_of(Hash)
         subject.status.should_not be_empty
       end
@@ -61,7 +63,9 @@ describe TestLab::Container do
 
     describe "#state" do
       it "should return the state of the container" do
+        subject.node.stub(:dead?) { false }
         subject.lxc.stub(:state) { :not_created }
+        subject.lxc_clone.stub(:exists?) { false }
         subject.state.should == :not_created
       end
     end
@@ -166,6 +170,7 @@ describe TestLab::Container do
         subject.lxc.stub(:state) { :stopped }
         subject.lxc.stub(:destroy) { true }
         subject.lxc_clone.stub(:exists?) { false }
+        subject.lxc_clone.stub(:destroy) { false }
         subject.stub(:provisioners) { Array.new }
 
         subject.destroy
@@ -175,15 +180,17 @@ describe TestLab::Container do
     describe "#up" do
       it "should up the container" do
         subject.node.stub(:state) { :running }
+
         subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:start) { true }
         subject.lxc.stub(:wait) { true }
         subject.lxc.stub(:state) { :running }
         subject.lxc.stub(:attach)
-        subject.stub(:provisioners) { Array.new }
 
         subject.lxc_clone.stub(:exists?) { false }
 
+        subject.stub(:provisioners) { Array.new }
+
         ZTK::TCPSocketCheck.any_instance.stub(:wait) { true }
 
         subject.up
@@ -193,10 +200,14 @@ describe TestLab::Container do
     describe "#down" do
       it "should down the container" do
         subject.node.stub(:state) { :running }
+
         subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:stop) { true }
         subject.lxc.stub(:wait) { true }
         subject.lxc.stub(:state) { :stopped }
+
+        subject.lxc_clone.stub(:exists?) { false }
+
         subject.stub(:provisioners) { Array.new }
 
         subject.down
@@ -207,8 +218,12 @@ describe TestLab::Container do
       context "with no provisioner" do
         it "should provision the container" do
           subject.node.stub(:state) { :running }
+
           subject.lxc.stub(:exists?) { true }
           subject.lxc.stub(:state) { :stopped }
+
+          subject.lxc_clone.stub(:exists?) { false }
+
           subject.stub(:provisioners) { Array.new }
 
           subject.provision
@@ -220,8 +235,12 @@ describe TestLab::Container do
           subject and (subject = TestLab::Container.first('server-shell'))
 
           subject.node.stub(:state) { :running }
+
           subject.lxc.stub(:exists?) { true }
           subject.lxc.stub(:state) { :stopped }
+
+          subject.lxc_clone.stub(:exists?) { false }
+
           subject.stub(:provisioners) { Array.new }
 
           subject.provision
@@ -233,8 +252,12 @@ describe TestLab::Container do
       context "with no provisioner" do
         it "should deprovision the container" do
           subject.node.stub(:state) { :running }
+
           subject.lxc.stub(:exists?) { true }
           subject.lxc.stub(:state) { :stopped }
+
+          subject.lxc_clone.stub(:exists?) { false }
+
           subject.stub(:provisioners) { Array.new }
 
           subject.deprovision
@@ -246,8 +269,12 @@ describe TestLab::Container do
           subject and (subject = TestLab::Container.first('server-shell'))
 
           subject.node.stub(:state) { :running }
+
           subject.lxc.stub(:exists?) { true }
           subject.lxc.stub(:state) { :stopped }
+
+          subject.lxc_clone.stub(:exists?) { false }
+
           subject.stub(:provisioners) { Array.new }
 
           subject.deprovision

data/spec/network_spec.rb

@@ -102,6 +102,7 @@ describe TestLab::Network do
 
     describe "#state" do
       it "should return the state of the bridge" do
+        subject.node.stub(:dead?) { false }
         subject.node.ssh.stub(:exec) { OpenStruct.new(:output => "          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1") }
         subject.state.should == :running
       end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.4.4
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lxc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ztk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -328,27 +303,26 @@ files:
 homepage: http://hackers.lookout.com/testlab/
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A toolkit for building virtual computer labs
 test_files:
 - features/step_definitions/container_steps.rb