ruby-libvirt 0.4.0 → 0.5.0

data/tests/test_interface.rb

@@ -7,15 +7,7 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
-def find_valid_iface(conn)
-  conn.list_interfaces.each do |ifname|
-    iface = conn.lookup_interface_by_name(ifname)
-    if iface.mac == "00:00:00:00:00:00"
-      next
-    end
-    return iface
-  end
-end
+set_test_object("interface")
 
 conn = Libvirt::open("qemu:///system")
 
@@ -83,7 +75,7 @@ testiface = find_valid_iface(conn)
 if not testiface.nil?
   expect_too_many_args(testiface, "mac", 1)
 
-  expect_success(testiface, "no args", "mac") {|x| x == testiface.mac}
+  expect_success(testiface, "no args", "mac")
 end
 
 # TESTGROUP: iface.xml_desc
@@ -101,6 +93,8 @@ expect_too_many_args(newiface, "free", 1)
 
 expect_success(newiface, "no args", "free")
 
+# END TESTS
+
 conn.close
 
 finish_tests

data/tests/test_network.rb

@@ -7,16 +7,11 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
+set_test_object("network")
+
 conn = Libvirt::open("qemu:///system")
 
-# initial cleanup for previous run
-begin
-  oldnet = conn.lookup_network_by_name("ruby-libvirt-tester")
-  oldnet.destroy
-  oldnet.undefine
-rescue
-  # in case we didn't find it, don't do anything
-end
+cleanup_test_network(conn)
 
 # TESTGROUP: net.undefine
 newnet = conn.define_network_xml($new_net_xml)
@@ -37,6 +32,19 @@ expect_fail(newnet, Libvirt::Error, "on already running network", "create")
 newnet.destroy
 newnet.undefine
 
+# TESTGROUP: net.update
+newnet = conn.create_network_xml($new_net_xml)
+
+expect_too_few_args(newnet, "update", 1)
+
+command = Libvirt::Network::NETWORK_UPDATE_COMMAND_ADD_LAST
+section = Libvirt::Network::NETWORK_SECTION_IP_DHCP_HOST
+flags   = Libvirt::Network::NETWORK_UPDATE_AFFECT_CURRENT
+expect_success(newnet, "dhcp ip", "update",
+               command, section, -1, $new_network_dhcp_ip, flags)
+
+newnet.destroy
+
 # TESTGROUP: net.destroy
 newnet = conn.create_network_xml($new_net_xml)
 
@@ -104,16 +112,16 @@ expect_invalid_arg_type(newnet, "autostart=", 1234)
 
 expect_success(newnet, "boolean arg", "autostart=", true)
 if not newnet.autostart?
-  puts_fail "net.autostart= did not set autostart to true"
+  puts_fail "network.autostart= did not set autostart to true"
 else
-  puts_ok "net.autostart= set autostart to true"
+  puts_ok "network.autostart= set autostart to true"
 end
 
 expect_success(newnet, "boolean arg", "autostart=", false)
 if newnet.autostart?
-  puts_fail "net.autostart= did not set autostart to false"
+  puts_fail "network.autostart= did not set autostart to false"
 else
-  puts_ok "net.autostart= set autostart to false"
+  puts_ok "network.autostart= set autostart to false"
 end
 
 newnet.undefine
@@ -160,6 +168,7 @@ expect_success(newnet, "no args", "persistent?") {|x| x == true}
 
 newnet.undefine
 
+# END TESTS
 
 conn.close
 

data/tests/test_nodedevice.rb

@@ -7,6 +7,8 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
+set_test_object("nodedevice")
+
 conn = Libvirt::open("qemu:///system")
 
 # TESTGROUP: nodedevice.name
@@ -43,7 +45,13 @@ expect_success(testnode, "no args", "xml_desc")
 # TESTGROUP: nodedevice.detach
 testnode = conn.lookup_nodedevice_by_name(conn.list_nodedevices[0])
 
-expect_too_many_args(testnode, "detach", 1)
+expect_too_many_args(testnode, "detach", 1, 2, 3)
+expect_invalid_arg_type(testnode, "detach", 1)
+expect_invalid_arg_type(testnode, "detach", [])
+expect_invalid_arg_type(testnode, "detach", {})
+expect_invalid_arg_type(testnode, "detach", nil, 'foo')
+expect_invalid_arg_type(testnode, "detach", nil, [])
+expect_invalid_arg_type(testnode, "detach", nil, {})
 
 #expect_success(testnode, "no args", "detach")
 
@@ -75,6 +83,8 @@ expect_too_many_args(testnode, "free", 1)
 
 expect_success(testnode, "no args", "free")
 
+# END TESTS
+
 conn.close
 
 finish_tests

data/tests/test_nwfilter.rb

@@ -7,6 +7,8 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
+set_test_object("nwfilter")
+
 conn = Libvirt::open("qemu:///system")
 
 # TESTGROUP: nwfilter.undefine
@@ -51,6 +53,8 @@ expect_too_many_args(newnw, "free", 1)
 
 expect_success(newnw, "no args", "free")
 
+# END TESTS
+
 conn.close
 
 finish_tests

data/tests/test_open.rb

@@ -7,6 +7,8 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
+set_test_object("Libvirt")
+
 def expect_connect_error(func, args)
   expect_fail(Libvirt, Libvirt::ConnectionError, "invalid driver", func, *args)
 end
@@ -59,6 +61,36 @@ conn.close
 conn = expect_success(Libvirt, "uri, full cred, and user args", "open_auth", "qemu:///system", [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello") {|x| x.class == Libvirt::Connect }
 conn.close
 
+# equivalent to expect_invalid_arg_type
+begin
+  conn = Libvirt::open_auth("qemu:///system", {}) do |cred|
+  end
+rescue TypeError => e
+  puts_ok "#{$test_object}.open_auth invalid arg type threw #{TypeError.to_s}"
+else
+  puts_fail "#{$test_object}.open_auth invalid arg type expected to throw #{TypeError.to_s}, but threw nothing"
+end
+
+# equivalent to expect_invalid_arg_type
+begin
+  conn = Libvirt::open_auth("qemu:///system", 1) do |cred|
+  end
+rescue TypeError => e
+  puts_ok "#{$test_object}.open_auth invalid arg type threw #{TypeError.to_s}"
+else
+  puts_fail "#{$test_object}.open_auth invalid arg type expected to throw #{TypeError.to_s}, but threw nothing"
+end
+
+# equivalent to expect_invalid_arg_type
+begin
+  conn = Libvirt::open_auth("qemu:///system", 'foo') do |cred|
+  end
+rescue TypeError => e
+  puts_ok "#{$test_object}.open_auth invalid arg type threw #{TypeError.to_s}"
+else
+  puts_fail "#{$test_object}.open_auth invalid arg type expected to throw #{TypeError.to_s}, but threw nothing"
+end
+
 # equivalent to "expect_success"
 begin
   conn = Libvirt::open_auth("qemu:///system", [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello") do |cred|
@@ -80,12 +112,25 @@ begin
     res
   end
 
-  puts_ok "open_auth uri, creds, userdata, auth block succeeded"
+  puts_ok "Libvirt.open_auth uri, creds, userdata, auth block succeeded"
   conn.close
 rescue NoMethodError
-  puts_skipped "open_auth does not exist"
+  puts_skipped "Libvirt.open_auth does not exist"
 rescue => e
-  puts_fail "open_auth uri, creds, userdata, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
+  puts_fail "Libvirt.open_auth uri, creds, userdata, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
+end
+
+# equivalent to "expect_success"
+begin
+  conn = Libvirt::open_auth("qemu:///system") do |cred|
+  end
+
+  puts_ok "Libvirt.open_auth uri, succeeded"
+  conn.close
+rescue NoMethodError
+  puts_skipped "Libvirt.open_auth does not exist"
+rescue => e
+  puts_fail "Libvirt.open_auth uri expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
 end
 
 # equivalent to "expect_success"
@@ -109,12 +154,12 @@ begin
     res
   end
 
-  puts_ok "open_auth uri, creds, userdata, R/O flag, auth block succeeded"
+  puts_ok "Libvirt.open_auth uri, creds, userdata, R/O flag, auth block succeeded"
   conn.close
 rescue NoMethodError
-  puts_skipped "open_auth does not exist"
+  puts_skipped "Libvirt.open_auth does not exist"
 rescue => e
-  puts_fail "open_auth uri, creds, userdata, R/O flag, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
+  puts_fail "Libvirt.open_auth uri, creds, userdata, R/O flag, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
 end
 
 # TESTGROUP: Libvirt::event_invoke_handle_callback
@@ -125,6 +170,9 @@ expect_too_few_args(Libvirt, "event_invoke_handle_callback")
 expect_too_few_args(Libvirt, "event_invoke_handle_callback", 1)
 expect_too_few_args(Libvirt, "event_invoke_handle_callback", 1, 2)
 expect_too_few_args(Libvirt, "event_invoke_handle_callback", 1, 2, 3)
+expect_invalid_arg_type(Libvirt, "event_invoke_handle_callback", "hello", 1, 1, 1)
+expect_invalid_arg_type(Libvirt, "event_invoke_handle_callback", "hello", 1, 1, [])
+expect_invalid_arg_type(Libvirt, "event_invoke_handle_callback", "hello", 1, 1, nil)
 # this is a bit bizarre; I am constructing a bogus hash to pass as the 4th
 # parameter to event_invoke_handle_callback.  In a real situation, I would
 # have been given this hash from libvirt earlier, and just pass it on.  I
@@ -145,6 +193,9 @@ conn = Libvirt::open("qemu:///system")
 expect_too_many_args(Libvirt, "event_invoke_timeout_callback", 1, 2, 3)
 expect_too_few_args(Libvirt, "event_invoke_timeout_callback")
 expect_too_few_args(Libvirt, "event_invoke_timeout_callback", 1)
+expect_invalid_arg_type(Libvirt, "event_invoke_timeout_callback", "hello", 1)
+expect_invalid_arg_type(Libvirt, "event_invoke_timeout_callback", "hello", [])
+expect_invalid_arg_type(Libvirt, "event_invoke_timeout_callback", "hello", nil)
 # this is a bit bizarre; I am constructing a bogus hash to pass as the 4th
 # parameter to event_invoke_handle_callback.  In a real situation, I would
 # have been given this hash from libvirt earlier, and just pass it on.  I
@@ -194,4 +245,6 @@ expect_success(Libvirt, "unregister all callbacks", "event_register_impl", nil,
 expect_success(Libvirt, "all Proc callbacks", "event_register_impl", virEventAddHandleProc, virEventUpdateHandleProc, virEventRemoveHandleProc, virEventAddTimerProc, virEventUpdateTimerProc, virEventRemoveTimerProc)
 expect_success(Libvirt, "unregister all callbacks", "event_register_impl")
 
+# END TESTS
+
 finish_tests

data/tests/test_secret.rb

@@ -7,6 +7,8 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
+set_test_object("secret")
+
 conn = Libvirt::open("qemu:///system")
 
 # TESTGROUP: secret.uuid
@@ -58,6 +60,27 @@ expect_success(newsecret, "value arg", "set_value", "foo")
 
 newsecret.undefine
 
+# TESTGROUP: secret.value=
+newsecret = conn.define_secret_xml($new_secret_xml)
+
+expect_too_many_args(newsecret, "value=", 1, 2)
+expect_too_few_args(newsecret, "value=")
+expect_invalid_arg_type(newsecret, "value=", {})
+expect_invalid_arg_type(newsecret, "value=", nil)
+expect_invalid_arg_type(newsecret, "value=", 1)
+expect_invalid_arg_type(newsecret, "value=", [1, 1])
+expect_invalid_arg_type(newsecret, "value=", [nil, 1])
+expect_invalid_arg_type(newsecret, "value=", [[], 1])
+expect_invalid_arg_type(newsecret, "value=", [{}, 1])
+expect_invalid_arg_type(newsecret, "value=", ['foo', nil])
+expect_invalid_arg_type(newsecret, "value=", ['foo', 'foo'])
+expect_invalid_arg_type(newsecret, "value=", ['foo', []])
+expect_invalid_arg_type(newsecret, "value=", ['foo', {}])
+
+expect_success(newsecret, "value arg", "value=", "foo")
+
+newsecret.undefine
+
 # TESTGROUP: secret.get_value
 newsecret = conn.define_secret_xml($new_secret_xml)
 newsecret.set_value("foo")
@@ -84,6 +107,8 @@ expect_too_many_args(newsecret, "free", 1)
 
 expect_success(newsecret, "no args", "free")
 
+# END TESTS
+
 conn.close
 
 finish_tests

data/tests/test_storage.rb

@@ -7,6 +7,8 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
+set_test_object("storage_pool")
+
 conn = Libvirt::open("qemu:///system")
 
 begin
@@ -18,7 +20,7 @@ rescue
 end
 
 # test setup
-`rm -rf #{$POOL_PATH}; mkdir #{$POOL_PATH} ; echo $?`
+`rm -rf #{$POOL_PATH}; mkdir -p #{$POOL_PATH} ; echo $?`
 
 new_storage_vol_xml = <<EOF
 <volume>
@@ -98,9 +100,10 @@ expect_invalid_arg_type(newpool, "delete", 'foo')
 
 expect_success(newpool, "no args", "delete")
 
-`mkdir /tmp/ruby-libvirt-tester`
+`mkdir -p /tmp/ruby-libvirt-tester`
 
 newpool.undefine
+`mkdir -p #{$POOL_PATH}`
 
 # TESTGROUP: pool.refresh
 newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
@@ -172,16 +175,16 @@ expect_invalid_arg_type(newpool, "autostart=", 1234)
 
 expect_success(newpool, "no args", "autostart=", true)
 if not newpool.autostart?
-  puts_fail "pool.autostart= did not set autostart to true"
+  puts_fail "storage_pool.autostart= did not set autostart to true"
 else
-  puts_ok "pool.autostart= set autostart to true"
+  puts_ok "storage_pool.autostart= set autostart to true"
 end
 
 expect_success(newpool, "no args", "autostart=", false)
 if newpool.autostart?
-  puts_fail "pool.autostart= did not set autostart to false"
+  puts_fail "storage_pool.autostart= did not set autostart to false"
 else
-  puts_ok "pool.autostart= set autostart to false"
+  puts_ok "storage_pool.autostart= set autostart to false"
 end
 
 newpool.undefine
@@ -200,8 +203,11 @@ newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "list_volumes", 1)
 
+expect_success(newpool, "no args", "list_volumes")
+newvol = newpool.create_volume_xml(new_storage_vol_xml)
 expect_success(newpool, "no args", "list_volumes")
 
+newvol.delete
 newpool.destroy
 
 # TESTGROUP: pool.free
@@ -256,28 +262,6 @@ expect_success(newpool, "name arg", "lookup_volume_by_path", newvol.path)
 newvol.delete
 newpool.destroy
 
-# TESTGROUP: vol.name
-newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
-newvol = newpool.create_volume_xml(new_storage_vol_xml)
-
-expect_too_many_args(newvol, "name", 1)
-
-expect_success(newvol, "no args", "name")
-
-newvol.delete
-newpool.destroy
-
-# TESTGROUP: vol.key
-newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
-newvol = newpool.create_volume_xml(new_storage_vol_xml)
-
-expect_too_many_args(newvol, "key", 1)
-
-expect_success(newvol, "no args", "key")
-
-newvol.delete
-newpool.destroy
-
 # TESTGROUP: pool.create_volume_xml
 newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
@@ -350,6 +334,43 @@ expect_success(newpool, "no args", "persistent?") {|x| x == true}
 
 newpool.undefine
 
+# TESTGROUP:
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
+sleep 1
+
+expect_too_many_args(newpool, "list_all_volumes", 1, 2)
+expect_invalid_arg_type(newpool, "list_all_volumes", 'foo')
+expect_invalid_arg_type(newpool, "list_all_volumes", [])
+expect_invalid_arg_type(newpool, "list_all_volumes", {})
+
+expect_success(newpool, "no args", "list_all_volumes")
+
+newpool.destroy
+
+set_test_object("storage_volume")
+
+# TESTGROUP: vol.name
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
+newvol = newpool.create_volume_xml(new_storage_vol_xml)
+
+expect_too_many_args(newvol, "name", 1)
+
+expect_success(newvol, "no args", "name")
+
+newvol.delete
+newpool.destroy
+
+# TESTGROUP: vol.key
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
+newvol = newpool.create_volume_xml(new_storage_vol_xml)
+
+expect_too_many_args(newvol, "key", 1)
+
+expect_success(newvol, "no args", "key")
+
+newvol.delete
+newpool.destroy
+
 # TESTGROUP: vol.delete
 newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
@@ -418,6 +439,89 @@ expect_success(newvol, "no args", "free")
 
 newpool.destroy
 
+# TESTGROUP: vol.download
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
+newvol = newpool.create_volume_xml(new_storage_vol_xml)
+stream = conn.stream
+
+expect_too_many_args(newvol, "download", 1, 2, 3, 4, 5)
+expect_too_few_args(newvol, "download")
+expect_too_few_args(newvol, "download", 1)
+expect_too_few_args(newvol, "download", 1, 2)
+expect_invalid_arg_type(newvol, "download", nil, 1, 1)
+expect_invalid_arg_type(newvol, "download", 'foo', 1, 1)
+expect_invalid_arg_type(newvol, "download", 1, 1, 1)
+expect_invalid_arg_type(newvol, "download", [], 1, 1)
+expect_invalid_arg_type(newvol, "download", {}, 1, 1)
+expect_invalid_arg_type(newvol, "download", stream, nil, 1)
+expect_invalid_arg_type(newvol, "download", stream, 'foo', 1)
+expect_invalid_arg_type(newvol, "download", stream, [], 1)
+expect_invalid_arg_type(newvol, "download", stream, {}, 1)
+expect_invalid_arg_type(newvol, "download", stream, 1, nil)
+expect_invalid_arg_type(newvol, "download", stream, 1, 'foo')
+expect_invalid_arg_type(newvol, "download", stream, 1, [])
+expect_invalid_arg_type(newvol, "download", stream, 1, {})
+expect_invalid_arg_type(newvol, "download", stream, 1, 1, 'foo')
+expect_invalid_arg_type(newvol, "download", stream, 1, 1, [])
+expect_invalid_arg_type(newvol, "download", stream, 1, 1, {})
+
+expect_success(newvol, "stream, offset, and length args", "download", stream, 0, 10)
+
+newvol.delete
+newpool.destroy
+
+# TESTGROUP: vol.upload
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
+newvol = newpool.create_volume_xml(new_storage_vol_xml)
+stream = conn.stream
+
+expect_too_many_args(newvol, "upload", 1, 2, 3, 4, 5)
+expect_too_few_args(newvol, "upload")
+expect_too_few_args(newvol, "upload", 1)
+expect_too_few_args(newvol, "upload", 1, 2)
+expect_invalid_arg_type(newvol, "upload", nil, 1, 1)
+expect_invalid_arg_type(newvol, "upload", 'foo', 1, 1)
+expect_invalid_arg_type(newvol, "upload", 1, 1, 1)
+expect_invalid_arg_type(newvol, "upload", [], 1, 1)
+expect_invalid_arg_type(newvol, "upload", {}, 1, 1)
+expect_invalid_arg_type(newvol, "upload", stream, nil, 1)
+expect_invalid_arg_type(newvol, "upload", stream, 'foo', 1)
+expect_invalid_arg_type(newvol, "upload", stream, [], 1)
+expect_invalid_arg_type(newvol, "upload", stream, {}, 1)
+expect_invalid_arg_type(newvol, "upload", stream, 1, nil)
+expect_invalid_arg_type(newvol, "upload", stream, 1, 'foo')
+expect_invalid_arg_type(newvol, "upload", stream, 1, [])
+expect_invalid_arg_type(newvol, "upload", stream, 1, {})
+expect_invalid_arg_type(newvol, "upload", stream, 1, 1, 'foo')
+expect_invalid_arg_type(newvol, "upload", stream, 1, 1, [])
+expect_invalid_arg_type(newvol, "upload", stream, 1, 1, {})
+
+expect_success(newvol, "stream, offset, and length args", "upload", stream, 0, 10)
+
+newvol.delete
+newpool.destroy
+
+# TESTGROUP: vol.upload
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
+newvol = newpool.create_volume_xml(new_storage_vol_xml)
+
+expect_too_many_args(newvol, "wipe_pattern", 1, 2, 3)
+expect_too_few_args(newvol, "wipe_pattern")
+expect_invalid_arg_type(newvol, "wipe_pattern", nil)
+expect_invalid_arg_type(newvol, "wipe_pattern", 'foo')
+expect_invalid_arg_type(newvol, "wipe_pattern", [])
+expect_invalid_arg_type(newvol, "wipe_pattern", {})
+expect_invalid_arg_type(newvol, "wipe_pattern", 0, 'foo')
+expect_invalid_arg_type(newvol, "wipe_pattern", 0, [])
+expect_invalid_arg_type(newvol, "wipe_pattern", 0, {})
+
+expect_success(newvol, "alg arg", "wipe_pattern", Libvirt::StorageVol::WIPE_ALG_ZERO)
+
+newvol.delete
+newpool.destroy
+
+# END TESTS
+
 conn.close
 
 finish_tests