ruby-libvirt 0.5.2 → 0.8.0

data/tests/test_conn.rb

@@ -16,8 +16,8 @@ cleanup_test_network(conn)
 
 # test setup
 begin
-  `rm -f /etc/sysconfig/network-scripts/ifcfg-ruby-libvirt-tester`
-  `brctl delbr ruby-libvirt-tester >& /dev/null`
+  `rm -f /etc/sysconfig/network-scripts/ifcfg-rb-libvirt-test`
+  `brctl delbr rb-libvirt-test >& /dev/null`
 rescue
 end
 `qemu-img create -f qcow2 #{$GUEST_DISK} 5G`
@@ -129,7 +129,7 @@ expect_fail(conn, ArgumentError, "empty array", "baseline_cpu", [])
 expect_success(conn, "CPU XML", "baseline_cpu", [cpu_xml])
 
 # TESTGROUP: conn.domain_event_register_any
-dom_event_callback_proc = lambda {|conn, dom, event, detail, opaque|
+dom_event_callback_proc = lambda {|connect, dom, event, detail, opaque|
 }
 
 # def dom_event_callback_symbol(conn, dom, event, detail, opaque)
@@ -256,11 +256,11 @@ expect_too_few_args(conn, "lookup_domain_by_name")
 expect_invalid_arg_type(conn, "lookup_domain_by_name", 1)
 expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_domain_by_name", "foobarbazsucker")
 
-expect_success(conn, "name arg for running domain", "lookup_domain_by_name", "ruby-libvirt-tester") {|x| x.name == "ruby-libvirt-tester"}
+expect_success(conn, "name arg for running domain", "lookup_domain_by_name", "rb-libvirt-test") {|x| x.name == "rb-libvirt-test"}
 newdom.destroy
 
 newdom = conn.define_domain_xml($new_dom_xml)
-expect_success(conn, "name arg for defined domain", "lookup_domain_by_name", "ruby-libvirt-tester") {|x| x.name == "ruby-libvirt-tester"}
+expect_success(conn, "name arg for defined domain", "lookup_domain_by_name", "rb-libvirt-test") {|x| x.name == "rb-libvirt-test"}
 newdom.undefine
 
 # TESTGROUP: conn.lookup_domain_by_id
@@ -292,7 +292,7 @@ expect_success(conn, "UUID arg for defined domain", "lookup_domain_by_uuid", new
 newdom.undefine
 
 # TESTGROUP: conn.define_domain_xml
-expect_too_many_args(conn, "define_domain_xml", 1, 2)
+expect_too_many_args(conn, "define_domain_xml", 1, 2, 3)
 expect_too_few_args(conn, "define_domain_xml")
 expect_invalid_arg_type(conn, "define_domain_xml", 1)
 expect_invalid_arg_type(conn, "define_domain_xml", nil)
@@ -351,11 +351,9 @@ expect_too_few_args(conn, "lookup_interface_by_name")
 expect_invalid_arg_type(conn, "lookup_interface_by_name", 1)
 expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_interface_by_name", "foobarbazsucker")
 
-expect_success(conn, "name arg", "lookup_interface_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_interface_by_name", "rb-libvirt-test")
 
-newiface.destroy
-
-expect_success(conn, "name arg", "lookup_interface_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_interface_by_name", "rb-libvirt-test")
 
 newiface.undefine
 
@@ -408,11 +406,11 @@ expect_too_few_args(conn, "lookup_network_by_name")
 expect_invalid_arg_type(conn, "lookup_network_by_name", 1)
 expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_network_by_name", "foobarbazsucker")
 
-expect_success(conn, "name arg", "lookup_network_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_network_by_name", "rb-libvirt-test")
 newnet.destroy
 
 newnet = conn.define_network_xml($new_net_xml)
-expect_success(conn, "name arg", "lookup_network_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_network_by_name", "rb-libvirt-test")
 newnet.undefine
 
 # TESTGROUP: conn.lookup_network_by_uuid
@@ -499,7 +497,7 @@ expect_too_many_args(conn, "lookup_nwfilter_by_name", 1, 2)
 expect_too_few_args(conn, "lookup_nwfilter_by_name")
 expect_invalid_arg_type(conn, "lookup_nwfilter_by_name", 1)
 
-expect_success(conn, "name arg", "lookup_nwfilter_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_nwfilter_by_name", "rb-libvirt-test")
 
 newnw.undefine
 
@@ -593,12 +591,12 @@ expect_too_few_args(conn, "lookup_storage_pool_by_name")
 expect_invalid_arg_type(conn, "lookup_storage_pool_by_name", 1)
 expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_storage_pool_by_name", "foobarbazsucker")
 
-expect_success(conn, "name arg", "lookup_storage_pool_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_storage_pool_by_name", "rb-libvirt-test")
 
 newpool.destroy
 
 newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
-expect_success(conn, "name arg", "lookup_storage_pool_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_storage_pool_by_name", "rb-libvirt-test")
 newpool.undefine
 
 # TESTGROUP: conn.lookup_storage_pool_by_uuid

data/tests/test_domain.rb

@@ -19,6 +19,8 @@ cleanup_test_domain(conn)
 
 # setup for later tests
 `qemu-img create -f qcow2 #{$GUEST_DISK} 5G`
+`qemu-img create -f raw #{$GUEST_RAW_DISK} 5G`
+
 
 new_hostdev_xml = <<EOF
 <hostdev mode='subsystem' type='pci' managed='yes'>
@@ -147,7 +149,7 @@ newdom.destroy
 
 # TESTGROUP: dom.send_key
 newdom = conn.create_domain_xml($new_dom_xml)
-sleep 30
+sleep 1
 
 expect_too_many_args(newdom, "send_key", 1, 2, 3, 4)
 expect_too_few_args(newdom, "send_key")
@@ -220,7 +222,7 @@ newdom.undefine
 
 newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
-expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_set_max_downtime", 10)
+#expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_set_max_downtime", 10)
 
 #newdom.migrate_to_uri("qemu://remote/system")
 #expect_success(newdom, "10 second downtime", "migrate_set_max_downtime", 10)
@@ -318,7 +320,7 @@ newdom.destroy
 newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
-expect_success(newdom, "no args running domain", "resume")
+expect_fail(newdom, Libvirt::Error, "already running", "resume")
 
 newdom.suspend
 expect_too_many_args(newdom, "resume", 1)
@@ -511,15 +513,15 @@ expect_invalid_arg_type(newdom, "block_peek", "foo", 0, "bar")
 expect_invalid_arg_type(newdom, "block_peek", "foo", 0, 512, "baz")
 expect_fail(newdom, Libvirt::RetrieveError, "invalid path", "block_peek", "foo", 0, 512)
 
-blockpeek = newdom.block_peek($GUEST_DISK, 0, 512)
+# blockpeek = newdom.block_peek($GUEST_RAW_DISK, 0, 512)
 
-# 0x51 0x46 0x49 0xfb are the first 4 bytes of a qcow2 image
-if blockpeek[0].unpack('C')[0] != 0x51 or blockpeek[1].unpack('C')[0] != 0x46 or
-  blockpeek[2].unpack('C')[0] != 0x49 or blockpeek[3].unpack('C')[0] != 0xfb
-  puts_fail "domain.block_peek read did not return valid data"
-else
-  puts_ok "domain.block_peek read valid data"
-end
+# # 0x51 0x46 0x49 0xfb are the first 4 bytes of a qcow2 image
+# if blockpeek[0].unpack('C')[0] != 0x51 or blockpeek[1].unpack('C')[0] != 0x46 or
+#   blockpeek[2].unpack('C')[0] != 0x49 or blockpeek[3].unpack('C')[0] != 0xfb
+#   puts_fail "domain.block_peek read did not return valid data"
+# else
+#   puts_ok "domain.block_peek read valid data"
+# end
 
 newdom.destroy
 
@@ -603,7 +605,8 @@ sleep 1
 
 expect_too_many_args(newdom, "name", 1)
 
-expect_success(newdom, "no args", "name") {|x| x == "ruby-libvirt-tester"}
+expect_success(newdom, "no args", "name") {|x| x == "rb-libvirt-test"}
+expect_success(newdom, "is UTF-8", "name") {|x| x.encoding.name == "UTF-8"}
 
 newdom.destroy
 
@@ -907,6 +910,7 @@ expect_too_many_args(newdom, "lookup_snapshot_by_name", 1, 2, 3)
 expect_too_few_args(newdom, "lookup_snapshot_by_name")
 expect_invalid_arg_type(newdom, "lookup_snapshot_by_name", 1)
 expect_invalid_arg_type(newdom, "lookup_snapshot_by_name", 'foo', 'bar')
+expect_utf8_exception_msg(newdom, Libvirt::RetrieveError, "lookup_snapshot_by_name", "__non_existing_snapshot")
 
 expect_success(newdom, "name arg", "lookup_snapshot_by_name", "foo")
 
@@ -1187,7 +1191,7 @@ newdom.undefine
 
 newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
-expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_max_downtime=", 10)
+#expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_max_downtime=", 10)
 
 # FIXME: get this working
 #newdom.migrate_to_uri("qemu://remote/system")
@@ -1406,6 +1410,7 @@ sleep 1
 # TESTGROUP: snapshot.parent
 newdom = conn.define_domain_xml($new_dom_xml)
 snap = newdom.snapshot_create_xml("<domainsnapshot/>")
+sleep 1
 snap2 = newdom.snapshot_create_xml("<domainsnapshot/>")
 
 expect_too_many_args(snap2, "parent", 1, 2)

data/tests/test_interface.rb

@@ -13,8 +13,8 @@ conn = Libvirt::open("qemu:///system")
 
 # test setup
 begin
-  `rm -f /etc/sysconfig/network-scripts/ifcfg-ruby-libvirt-tester`
-  `brctl delbr ruby-libvirt-tester >& /dev/null`
+  `rm -f /etc/sysconfig/network-scripts/ifcfg-rb-libvirt-test`
+  `brctl delbr rb-libvirt-test >& /dev/null`
 rescue
 end
 
@@ -44,7 +44,7 @@ newiface = conn.define_interface_xml($new_interface_xml)
 expect_too_many_args(newiface, "destroy", 1, 2)
 expect_invalid_arg_type(newiface, "destroy", 'foo')
 
-expect_success(newiface, "no args", "destroy")
+#expect_success(newiface, "no args", "destroy")
 
 newiface.undefine
 
@@ -66,7 +66,7 @@ newiface = conn.define_interface_xml($new_interface_xml)
 
 expect_too_many_args(newiface, "name", 1)
 
-expect_success(newiface, "no args", "name") {|x| x == "ruby-libvirt-tester"}
+expect_success(newiface, "no args", "name") {|x| x == "rb-libvirt-test"}
 
 newiface.undefine
 

data/tests/test_network.rb

@@ -57,7 +57,7 @@ newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "name", 1)
 
-expect_success(newnet, "no args", "name") {|x| x == "ruby-libvirt-tester"}
+expect_success(newnet, "no args", "name") {|x| x == "rb-libvirt-test"}
 
 newnet.destroy
 

data/tests/test_nwfilter.rb

@@ -23,7 +23,7 @@ newnw = conn.define_nwfilter_xml($new_nwfilter_xml)
 
 expect_too_many_args(newnw, "name", 1)
 
-expect_success(newnw, "no args", "name") {|x| x == "ruby-libvirt-tester"}
+expect_success(newnw, "no args", "name") {|x| x == "rb-libvirt-test"}
 
 newnw.undefine
 

data/tests/test_storage.rb

@@ -12,7 +12,7 @@ set_test_object("storage_pool")
 conn = Libvirt::open("qemu:///system")
 
 begin
-  oldpool = conn.lookup_storage_pool_by_name("ruby-libvirt-tester")
+  oldpool = conn.lookup_storage_pool_by_name("rb-libvirt-test")
   oldpool.destroy
   oldpool.undefine
 rescue
@@ -28,7 +28,7 @@ new_storage_vol_xml = <<EOF
   <allocation>0</allocation>
   <capacity unit="G">1</capacity>
   <target>
-    <path>/tmp/ruby-libvirt-tester/test.img</path>
+    <path>/tmp/rb-libvirt-test/test.img</path>
   </target>
 </volume>
 EOF
@@ -39,7 +39,7 @@ new_storage_vol_xml_2 = <<EOF
   <allocation>0</allocation>
   <capacity unit="G">5</capacity>
   <target>
-    <path>/tmp/ruby-libvirt-tester/test2.img</path>
+    <path>/tmp/rb-libvirt-test/test2.img</path>
   </target>
 </volume>
 EOF
@@ -100,7 +100,7 @@ expect_invalid_arg_type(newpool, "delete", 'foo')
 
 expect_success(newpool, "no args", "delete")
 
-`mkdir -p /tmp/ruby-libvirt-tester`
+`mkdir -p /tmp/rb-libvirt-test`
 
 newpool.undefine
 `mkdir -p #{$POOL_PATH}`
@@ -120,7 +120,7 @@ newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "name", 1)
 
-expect_success(newpool, "no args", "name") {|x| x == "ruby-libvirt-tester"}
+expect_success(newpool, "no args", "name") {|x| x == "rb-libvirt-test"}
 
 newpool.destroy
 

data/tests/test_stream.rb

@@ -88,7 +88,7 @@ expect_fail(st, RuntimeError, "no block given", "recvall")
 st.free
 
 # TESTGROUP: stream.event_add_callback
-st_event_callback_proc = lambda {|st,events,opaque|
+st_event_callback_proc = lambda {|stream,events,opaque|
 }
 
 st = conn.stream

data/tests/test_utils.rb

@@ -4,16 +4,17 @@ $SKIPPED = 0
 
 URI = ENV['RUBY_LIBVIRT_TEST_URI'] || "qemu:///system"
 
-$GUEST_BASE = '/var/lib/libvirt/images/ruby-libvirt-tester'
+$GUEST_BASE = '/var/lib/libvirt/images/rb-libvirt-test'
 $GUEST_DISK = $GUEST_BASE + '.qcow2'
 $GUEST_SAVE = $GUEST_BASE + '.save'
 $GUEST_UUID = "93a5c045-6457-2c09-e56f-927cdf34e17a"
+$GUEST_RAW_DISK = $GUEST_BASE + '.raw'
 
 # XML data for later tests
 $new_dom_xml = <<EOF
 <domain type='kvm'>
   <description>Ruby Libvirt Tester</description>
-  <name>ruby-libvirt-tester</name>
+  <name>rb-libvirt-test</name>
   <uuid>#{$GUEST_UUID}</uuid>
   <memory>1048576</memory>
   <currentMemory>1048576</currentMemory>
@@ -59,11 +60,11 @@ $new_dom_xml = <<EOF
 EOF
 
 # qemu command-line that roughly corresponds to the above XML
-$qemu_cmd_line = "/usr/bin/qemu-kvm -S -M pc-0.13 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name ruby-libvirt-tester -uuid #{$GUEST_UUID} -nodefconfig -nodefaults -chardev socket,id=monitor,path=/var/lib/libvirt/qemu/ruby-libvirt-tester.monitor,server,nowait -mon chardev=monitor,mode=readline -rtc base=utc -boot c -chardev pty,id=serial0 -device isa-serial,chardev=serial0 -usb -vnc 127.0.0.1:0 -k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5"
+$qemu_cmd_line = "/usr/bin/qemu-kvm -S -M pc-0.13 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name rb-libvirt-test -uuid #{$GUEST_UUID} -nodefconfig -nodefaults -chardev socket,id=monitor,path=/var/lib/libvirt/qemu/rb-libvirt-test.monitor,server,nowait -mon chardev=monitor,mode=readline -rtc base=utc -boot c -chardev pty,id=serial0 -device isa-serial,chardev=serial0 -usb -vnc 127.0.0.1:0 -k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5"
 
 $NEW_INTERFACE_MAC = 'aa:bb:cc:dd:ee:ff'
 $new_interface_xml = <<EOF
-<interface type="ethernet" name="ruby-libvirt-tester">
+<interface type="ethernet" name="rb-libvirt-test">
   <start mode="onboot"/>
   <mac address="#{$NEW_INTERFACE_MAC}"/>
   <protocol family='ipv4'>
@@ -75,7 +76,7 @@ EOF
 $NETWORK_UUID = "04068860-d9a2-47c5-bc9d-9e047ae901da"
 $new_net_xml = <<EOF
 <network>
-  <name>ruby-libvirt-tester</name>
+  <name>rb-libvirt-test</name>
   <uuid>#{$NETWORK_UUID}</uuid>
   <forward mode='nat'/>
   <bridge name='rubybr0' stp='on' delay='0' />
@@ -93,7 +94,7 @@ EOF
 
 $NWFILTER_UUID = "bd339530-134c-6d07-441a-17fb90dad807"
 $new_nwfilter_xml = <<EOF
-<filter name='ruby-libvirt-tester' chain='ipv4'>
+<filter name='rb-libvirt-test' chain='ipv4'>
   <uuid>#{$NWFILTER_UUID}</uuid>
   <rule action='accept' direction='out' priority='100'>
     <ip srcipaddr='0.0.0.0' dstipaddr='255.255.255.255' protocol='tcp' srcportstart='63000' dstportstart='62000'/>
@@ -116,10 +117,10 @@ $new_secret_xml = <<EOF
 EOF
 
 $POOL_UUID = "33a5c045-645a-2c00-e56b-927cdf34e17a"
-$POOL_PATH = "/var/lib/libvirt/images/ruby-libvirt-tester"
+$POOL_PATH = "/var/lib/libvirt/images/rb-libvirt-test"
 $new_storage_pool_xml = <<EOF
 <pool type="dir">
-  <name>ruby-libvirt-tester</name>
+  <name>rb-libvirt-test</name>
   <uuid>#{$POOL_UUID}</uuid>
   <target>
     <path>#{$POOL_PATH}</path>
@@ -165,6 +166,24 @@ def expect_fail(object, errtype, errmsg, func, *args)
   end
 end
 
+def expect_utf8_exception_msg(object, errtype, func, *args)
+  begin
+    object.__send__(func, *args)
+  rescue NoMethodError
+    puts_skipped "#{$test_object}.#{func} does not exist"
+  rescue errtype => e
+    if e.message.encoding.name == 'UTF-8'
+      puts_ok "#{$test_object}.#{func} threw #{errtype.to_s} with UTF-8 encoding"
+    else
+      puts_fail "#{$test_object}.#{func} threw #{errtype.to_s} with #{e.message.encoding.name} encoding"
+    end
+  rescue => e
+    puts_fail "#{$test_object}.#{func} expected to throw #{errtype.to_s}, but instead threw #{e.class.to_s}: #{e.to_s}"
+  else
+    puts_fail "#{$test_object}.#{func} expected to throw #{errtype.to_s}, but threw nothing"
+  end
+end
+
 def expect_too_many_args(object, func, *args)
   expect_fail(object, ArgumentError, "too many args", func, *args)
 end
@@ -210,7 +229,7 @@ end
 def cleanup_test_domain(conn)
   # cleanup from previous runs
   begin
-    olddom = conn.lookup_domain_by_name("ruby-libvirt-tester")
+    olddom = conn.lookup_domain_by_name("rb-libvirt-test")
   rescue
     # in case we didn't find it, don't do anything
   end
@@ -234,7 +253,7 @@ end
 def cleanup_test_network(conn)
   # initial cleanup for previous run
   begin
-    oldnet = conn.lookup_network_by_name("ruby-libvirt-tester")
+    oldnet = conn.lookup_network_by_name("rb-libvirt-test")
   rescue
     # in case we didn't find it, don't do anything
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.8.0
 platform: ruby
 authors:
 - David Lutterkort, Chris Lalancette
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings for libvirt.
 email: libvir-list@redhat.com
@@ -17,12 +17,11 @@ extensions:
 - ext/libvirt/extconf.rb
 extra_rdoc_files: []
 files:
-- Rakefile
 - COPYING
-- README
 - NEWS
+- README
 - README.rdoc
-- lib/libvirt.rb
+- Rakefile
 - ext/libvirt/_libvirt.c
 - ext/libvirt/common.c
 - ext/libvirt/common.h
@@ -30,6 +29,8 @@ files:
 - ext/libvirt/connect.h
 - ext/libvirt/domain.c
 - ext/libvirt/domain.h
+- ext/libvirt/extconf.h
+- ext/libvirt/extconf.rb
 - ext/libvirt/interface.c
 - ext/libvirt/interface.h
 - ext/libvirt/network.c
@@ -44,7 +45,7 @@ files:
 - ext/libvirt/storage.h
 - ext/libvirt/stream.c
 - ext/libvirt/stream.h
-- ext/libvirt/extconf.rb
+- lib/libvirt.rb
 - tests/test_conn.rb
 - tests/test_domain.rb
 - tests/test_interface.rb
@@ -58,26 +59,25 @@ files:
 - tests/test_utils.rb
 homepage: http://libvirt.org/ruby/
 licenses:
-- LGPLv2
+- LGPL-2.1-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: None
-rubygems_version: 2.0.14
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Ruby bindings for LIBVIRT
 test_files: []