virtualbox 0.7.9 → 0.8.0

data/test/virtualbox/vm_test.rb

@@ -217,16 +217,19 @@ class VMTest < Test::Unit::TestCase
         @interface.stubs(:parent).returns(@interface_parent)
       end
 
-      should "destroy snapshots, relationships, then the machine" do
+      should "do a full destroy and destroy the media" do
         destroy_seq = sequence("destroy_seq")
-        snapshot = mock("snapshot")
-        snapshot.stubs(:children).returns([])
-        @instance.stubs(:root_snapshot).returns(snapshot)
-        snapshot.expects(:destroy).once.in_sequence(destroy_seq)
-        @instance.expects(:reload).once.in_sequence(destroy_seq)
-        VirtualBox::StorageController.expects(:destroy_relationship).in_sequence(destroy_seq)
-        @interface_parent.expects(:unregister_machine).with(@instance.uuid).in_sequence(destroy_seq)
-        @interface.expects(:delete_settings).once.in_sequence(destroy_seq)
+        media = [1,2,3]
+        progress = mock("progress")
+        @interface.expects(:unregister).with(:full).once.returns(media).in_sequence(destroy_seq)
+        @interface.expects(:delete).with(media).once.returns(progress).in_sequence(destroy_seq)
+
+        @instance.destroy
+      end
+
+      should "not destroy media if there aren't any" do
+        @interface.expects(:unregister).with(:full).once.returns([])
+        @interface.expects(:delete).never
 
         @instance.destroy
       end
@@ -259,12 +262,11 @@ class VMTest < Test::Unit::TestCase
         @session.stubs(:state).returns(:open)
       end
 
-      should "open remote session using the given mode, wait for completion, then close" do
+      should "launch the VM with the given mode" do
         start_seq = sequence('start_seq')
         mode = "foo"
-        @parent.expects(:open_remote_session).with(@session, @uuid, mode, "").once.returns(@progress).in_sequence(start_seq)
-        @progress.expects(:wait_for_completion).with(-1).in_sequence(start_seq)
-        @session.expects(:close).in_sequence(start_seq)
+        @interface.expects(:launch_vm_process).with(@session, mode, "").once.returns(@progress).in_sequence(start_seq)
+        @progress.expects(:wait).in_sequence(start_seq)
         assert @instance.start(mode)
       end
 
@@ -278,22 +280,21 @@ class VMTest < Test::Unit::TestCase
       setup do
         setup_session_mocks
 
-        @parent.stubs(:open_existing_session)
-
         @console = mock("console")
         @console.stubs(:send)
         @session.stubs(:console).returns(@console)
         @session.stubs(:state).returns(:open)
 
+        @instance.stubs(:with_open_session).yields(@session)
+
         @method = :foo
       end
 
       should "get an existing, session, send the command, and close" do
         method = :foo
         control_seq = sequence("control_seq")
-        @parent.expects(:open_existing_session).with(@session, @uuid).once.in_sequence(control_seq)
+        @instance.expects(:with_open_session).with(:shared).yields(@session).in_sequence(control_seq)
         @console.expects(:send).with(@method).once.in_sequence(control_seq)
-        @session.expects(:close).in_sequence(control_seq)
 
         @instance.control(@method)
       end
@@ -301,7 +302,7 @@ class VMTest < Test::Unit::TestCase
       should "wait for completion if an IProgress is returned" do
         progress = mock("IProgress")
         progress.stubs(:is_a?).with(VirtualBox::COM::Util.versioned_interface(:Progress)).returns(true)
-        progress.expects(:wait_for_completion).with(-1).once
+        progress.expects(:wait).once
         @console.expects(:send).with(@method).returns(progress)
         @instance.control(@method)
       end
@@ -394,12 +395,12 @@ class VMTest < Test::Unit::TestCase
         @locked_interface.stubs(:state).returns(:powered_off)
         @session.stubs(:machine).returns(@locked_interface)
         @session.stubs(:state).returns(:closed)
-        @parent.stubs(:open_session)
+        @interface.stubs(:lock_machine)
       end
 
       should "close the session if an exception is raised" do
         @locked_interface.expects(:save_settings).raises(Exception)
-        @session.expects(:close).once
+        @session.expects(:unlock_machine).once
 
         assert_raises(Exception) do
           @instance.with_open_session do
@@ -413,23 +414,31 @@ class VMTest < Test::Unit::TestCase
         save_seq = sequence("save_seq")
         @proc = Proc.new {}
 
-        @parent.expects(:open_session).with(@session, @uuid).in_sequence(save_seq)
+        @interface.expects(:lock_machine).with(@session, :write).in_sequence(save_seq)
         @proc.expects(:call).with(@session).once.in_sequence(save_seq)
         @locked_interface.expects(:save_settings).once.in_sequence(save_seq)
-        @session.expects(:close).in_sequence(save_seq)
+        @session.expects(:unlock_machine).in_sequence(save_seq)
 
         @instance.with_open_session do |session|
           @proc.call(session)
         end
       end
 
+      should "open the session with the shared type and NOT save settings" do
+        @interface.expects(:lock_machine).with(@session, :shared)
+        @session.expects(:unlock_machine)
+        @locked_interface.expects(:save_settings).never
+
+        @instance.with_open_session(:shared)
+      end
+
       should "not save settings when the state is saved" do
         @locked_interface.stubs(:state).returns(:saved)
 
         save_seq = sequence("save_seq")
-        @parent.expects(:open_session).with(@session, @uuid).in_sequence(save_seq)
+        @interface.expects(:lock_machine).with(@session, :write).in_sequence(save_seq)
         @locked_interface.expects(:save_settings).never
-        @session.expects(:close).in_sequence(save_seq)
+        @session.expects(:unlock_machine).in_sequence(save_seq)
 
         @instance.with_open_session { |session| }
       end
@@ -437,9 +446,9 @@ class VMTest < Test::Unit::TestCase
       should "only open the session and close once" do
         open_seq = sequence("open_seq")
 
-        @parent.expects(:open_session).with(@session, @uuid).in_sequence(open_seq)
+        @interface.expects(:lock_machine).with(@session, :write).in_sequence(open_seq)
         @locked_interface.expects(:save_settings).once.in_sequence(open_seq)
-        @session.expects(:close).once.in_sequence(open_seq)
+        @session.expects(:unlock_machine).once.in_sequence(open_seq)
 
         @instance.with_open_session do |session|
           session.stubs(:state).returns(:open)

data/test/virtualbox/{vrdp_server_test.rb → vrde_server_test.rb}

@@ -1,8 +1,8 @@
 require File.expand_path("../../test_helper", __FILE__)
 
-class VRDPServerTest < Test::Unit::TestCase
+class VRDEServerTest < Test::Unit::TestCase
   setup do
-    @klass = VirtualBox::VRDPServer
+    @klass = VirtualBox::VRDEServer
     @interface = mock("interface")
     @parent = mock("parent")
   end
@@ -13,12 +13,12 @@ class VRDPServerTest < Test::Unit::TestCase
         @instance = mock("instance")
         @klass.stubs(:new).returns(@instance)
 
-        @vrdp_server = mock("vrdp_server")
-        @interface.stubs(:vrdp_server).returns(@vrdp_server)
+        @vrde_server = mock("vrde_server")
+        @interface.stubs(:vrde_server).returns(@vrde_server)
       end
 
       should "call new for the interface" do
-        @klass.expects(:new).with(nil, @vrdp_server).once.returns(@instance)
+        @klass.expects(:new).with(nil, @vrde_server).once.returns(@instance)
         assert_equal @instance, @klass.populate_relationship(nil, @interface)
       end
     end
@@ -65,17 +65,17 @@ class VRDPServerTest < Test::Unit::TestCase
 
     context "saving" do
       setup do
-        @vrdp_server = mock("vrdp_server")
+        @vrde_server = mock("vrde_server")
         @session = mock("session")
         @machine = mock("machine")
-        @machine.stubs(:vrdp_server).returns(@vrdp_server)
+        @machine.stubs(:vrde_server).returns(@vrde_server)
         @session.stubs(:machine).returns(@machine)
         @parent.stubs(:with_open_session).yields(@session)
       end
 
       should "save the interface settings with the new bios settings" do
         save_seq = sequence("save_seq")
-        @instance.expects(:save_changed_interface_attributes).with(@vrdp_server).once.in_sequence(save_seq)
+        @instance.expects(:save_changed_interface_attributes).with(@vrde_server).once.in_sequence(save_seq)
         @instance.save
       end
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 9
-  version: 0.7.9
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -08:00
+date: 2010-12-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -260,6 +260,76 @@ files:
 - lib/virtualbox/com/interface/3.2.x/virtualbox.rb
 - lib/virtualbox/com/interface/3.2.x/vrdp_auth_type.rb
 - lib/virtualbox/com/interface/3.2.x/vrdp_server.rb
+- lib/virtualbox/com/interface/4.0.x/access_mode.rb
+- lib/virtualbox/com/interface/4.0.x/appliance.rb
+- lib/virtualbox/com/interface/4.0.x/audio_adapter.rb
+- lib/virtualbox/com/interface/4.0.x/audio_controller_type.rb
+- lib/virtualbox/com/interface/4.0.x/audio_driver_type.rb
+- lib/virtualbox/com/interface/4.0.x/auth_type.rb
+- lib/virtualbox/com/interface/4.0.x/bios_boot_menu_mode.rb
+- lib/virtualbox/com/interface/4.0.x/bios_settings.rb
+- lib/virtualbox/com/interface/4.0.x/cleanup_mode.rb
+- lib/virtualbox/com/interface/4.0.x/clipboard_mode.rb
+- lib/virtualbox/com/interface/4.0.x/console.rb
+- lib/virtualbox/com/interface/4.0.x/cpu_property_type.rb
+- lib/virtualbox/com/interface/4.0.x/device_type.rb
+- lib/virtualbox/com/interface/4.0.x/dhcp_server.rb
+- lib/virtualbox/com/interface/4.0.x/event_source.rb
+- lib/virtualbox/com/interface/4.0.x/fault_tolerance_state.rb
+- lib/virtualbox/com/interface/4.0.x/firmware_type.rb
+- lib/virtualbox/com/interface/4.0.x/guest.rb
+- lib/virtualbox/com/interface/4.0.x/guest_os_type.rb
+- lib/virtualbox/com/interface/4.0.x/host.rb
+- lib/virtualbox/com/interface/4.0.x/host_network_interface.rb
+- lib/virtualbox/com/interface/4.0.x/host_network_interface_medium_type.rb
+- lib/virtualbox/com/interface/4.0.x/host_network_interface_status.rb
+- lib/virtualbox/com/interface/4.0.x/host_network_interface_type.rb
+- lib/virtualbox/com/interface/4.0.x/host_usb_device.rb
+- lib/virtualbox/com/interface/4.0.x/host_usb_device_filter.rb
+- lib/virtualbox/com/interface/4.0.x/hw_virt_ex_property_type.rb
+- lib/virtualbox/com/interface/4.0.x/keyboard_hid_type.rb
+- lib/virtualbox/com/interface/4.0.x/lock_type.rb
+- lib/virtualbox/com/interface/4.0.x/machine.rb
+- lib/virtualbox/com/interface/4.0.x/machine_state.rb
+- lib/virtualbox/com/interface/4.0.x/medium.rb
+- lib/virtualbox/com/interface/4.0.x/medium_attachment.rb
+- lib/virtualbox/com/interface/4.0.x/medium_format.rb
+- lib/virtualbox/com/interface/4.0.x/medium_state.rb
+- lib/virtualbox/com/interface/4.0.x/medium_type.rb
+- lib/virtualbox/com/interface/4.0.x/medium_variant.rb
+- lib/virtualbox/com/interface/4.0.x/nat_alias_mode.rb
+- lib/virtualbox/com/interface/4.0.x/nat_engine.rb
+- lib/virtualbox/com/interface/4.0.x/nat_protocol.rb
+- lib/virtualbox/com/interface/4.0.x/network_adapter.rb
+- lib/virtualbox/com/interface/4.0.x/network_adapter_type.rb
+- lib/virtualbox/com/interface/4.0.x/network_attachment_type.rb
+- lib/virtualbox/com/interface/4.0.x/nsiexception.rb
+- lib/virtualbox/com/interface/4.0.x/nsisupports.rb
+- lib/virtualbox/com/interface/4.0.x/parallel_port.rb
+- lib/virtualbox/com/interface/4.0.x/pointing_hid_type.rb
+- lib/virtualbox/com/interface/4.0.x/port_mode.rb
+- lib/virtualbox/com/interface/4.0.x/progress.rb
+- lib/virtualbox/com/interface/4.0.x/serial_port.rb
+- lib/virtualbox/com/interface/4.0.x/session.rb
+- lib/virtualbox/com/interface/4.0.x/session_state.rb
+- lib/virtualbox/com/interface/4.0.x/session_type.rb
+- lib/virtualbox/com/interface/4.0.x/shared_folder.rb
+- lib/virtualbox/com/interface/4.0.x/snapshot.rb
+- lib/virtualbox/com/interface/4.0.x/storage_bus.rb
+- lib/virtualbox/com/interface/4.0.x/storage_controller.rb
+- lib/virtualbox/com/interface/4.0.x/storage_controller_type.rb
+- lib/virtualbox/com/interface/4.0.x/system_properties.rb
+- lib/virtualbox/com/interface/4.0.x/usb_controller.rb
+- lib/virtualbox/com/interface/4.0.x/usb_device.rb
+- lib/virtualbox/com/interface/4.0.x/usb_device_filter.rb
+- lib/virtualbox/com/interface/4.0.x/usb_device_filter_action.rb
+- lib/virtualbox/com/interface/4.0.x/usb_device_state.rb
+- lib/virtualbox/com/interface/4.0.x/virtual_box_error_info.rb
+- lib/virtualbox/com/interface/4.0.x/virtual_system_description.rb
+- lib/virtualbox/com/interface/4.0.x/virtual_system_description_type.rb
+- lib/virtualbox/com/interface/4.0.x/virtual_system_description_value_type.rb
+- lib/virtualbox/com/interface/4.0.x/virtualbox.rb
+- lib/virtualbox/com/interface/4.0.x/vrde_server.rb
 - lib/virtualbox/com/mscom_interface.rb
 - lib/virtualbox/com/nil_interface.rb
 - lib/virtualbox/com/util.rb
@@ -296,7 +366,7 @@ files:
 - lib/virtualbox/version.rb
 - lib/virtualbox/virtual_system_description.rb
 - lib/virtualbox/vm.rb
-- lib/virtualbox/vrdp_server.rb
+- lib/virtualbox/vrde_server.rb
 - test/test_helper.rb
 - test/virtualbox/abstract_model/attributable_test.rb
 - test/virtualbox/abstract_model/dirty_test.rb
@@ -348,7 +418,7 @@ files:
 - test/virtualbox/version_test.rb
 - test/virtualbox/virtual_system_description_test.rb
 - test/virtualbox/vm_test.rb
-- test/virtualbox/vrdp_server_test.rb
+- test/virtualbox/vrde_server_test.rb
 - test/virtualbox_test.rb
 - virtualbox.gemspec
 has_rdoc: true
@@ -365,7 +435,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2285628671493140587
+      hash: -1020338356590497773
       segments: 
       - 0
       version: "0"