Tests for mac address setting on host only network

lib/vagrant/action/vm/network.rb

@@ -65,9 +65,7 @@ module Vagrant
             adapter.enabled = true
             adapter.attachment_type = :host_only
             adapter.host_interface = network_name(network_options)
-            if network_options[:mac]
+            adapter.mac_address = network_options[:mac].gsub(':', '') if network_options[:mac]
-              adapter.mac_address = network_options[:mac].gsub(/:/, '')
-            end
             adapter.save
           end
         end

test/vagrant/action/vm/network_test.rb

@@ -116,24 +116,44 @@ class NetworkVMActionTest < Test::Unit::TestCase
 
         @network_adapters = []
         @internal_vm.stubs(:network_adapters).returns(@network_adapters)
+      end
 
-        @options = {
+      def expect_adapter_setup(options=nil)
+        options = {
           :ip => "foo",
           :adapter => 7
-        }
+        }.merge(options || {})
 
-        @env.env.config.vm.network(@options[:ip], @options)
+        @env["config"].vm.network(options[:ip], options)
+
+        @env["vm"].vm.network_adapters.clear
+        @env["vm"].vm.network_adapters[options[:adapter]] = adapter = mock("adapter")
+
+        adapter.expects(:enabled=).with(true)
+        adapter.expects(:attachment_type=).with(:host_only).once
+        adapter.expects(:host_interface=).with(@network_name).once
+
+        if options[:mac]
+          adapter.expects(:mac_address=).with(options[:mac].gsub(':', '')).once
+        else
+          adapter.expects(:mac_address=).never
+        end
+
+        adapter.expects(:save).once
       end
 
       should "setup the specified network adapter" do
-        adapter = mock("adapter")
+        expect_adapter_setup
-        @network_adapters[@options[:adapter]] = adapter
+        @instance.assign_network
+      end
 
-        adapter.expects(:enabled=).with(true).once
+      should "setup the specified network adapter's mac address if specified" do
-        adapter.expects(:attachment_type=).with(:host_only).once
+        expect_adapter_setup(:mac => "foo")
-        adapter.expects(:host_interface=).with(@network_name).once
+        @instance.assign_network
-        adapter.expects(:save).once
+      end
 
+      should "properly remove : from mac address" do
+        expect_adapter_setup(:mac => "foo:bar")
         @instance.assign_network
       end
     end