ruby-libvirt 0.4.0 → 0.5.0

data/tests/test_stream.rb

@@ -0,0 +1,171 @@
+#!/usr/bin/ruby
+
+# Test the stream methods the bindings support
+
+$: << File.dirname(__FILE__)
+
+require 'libvirt'
+require 'test_utils.rb'
+
+set_test_object("stream")
+
+conn = Libvirt::open("qemu:///system")
+
+# TESTGROUP: stream.send
+st = conn.stream
+
+expect_too_many_args(st, "send", 1, 2)
+expect_too_few_args(st, "send")
+expect_invalid_arg_type(st, "send", 1)
+expect_invalid_arg_type(st, "send", nil)
+expect_invalid_arg_type(st, "send", [])
+expect_invalid_arg_type(st, "send", {})
+
+# FIXME: we need to setup a proper stream for this to work
+#expect_success(st, "buffer arg", "send", buffer)
+
+st.free
+
+# TESTGROUP: stream.recv
+st = conn.stream
+
+expect_too_many_args(st, "recv", 1, 2)
+expect_too_few_args(st, "recv")
+expect_invalid_arg_type(st, "recv", nil)
+expect_invalid_arg_type(st, "recv", 'foo')
+expect_invalid_arg_type(st, "recv", [])
+expect_invalid_arg_type(st, "recv", {})
+
+# FIXME: we need to setup a proper stream for this to work
+#expect_success(st, "bytes arg", "recv", 12)
+
+st.free
+
+# TESTGROUP: stream.sendall
+st = conn.stream
+
+# equivalent to expect_too_many_args
+begin
+  st.sendall(1, 2) {|x,y| x = y}
+rescue NoMethodError
+  puts_skipped "#{$test_object}.sendall does not exist"
+rescue ArgumentError => e
+  puts_ok "#{$test_object}.sendall too many args threw #{ArgumentError.to_s}"
+rescue => e
+  puts_fail "#{$test_object}.sendall too many args expected to throw #{ArgumentError.to_s}, but instead threw #{e.class.to_s}: #{e.to_s}"
+else
+  puts_fail "#{$test_object}.sendall too many args expected to throw #{ArgumentError.to_s}, but threw nothing"
+end
+
+expect_fail(st, RuntimeError, "no block given", "sendall")
+
+# FIXME: we need to setup a proper stream for this to work
+#st.sendall {|opaque,nbytes| return opaque}
+
+st.free
+
+# TESTGROUP: stream.recvall
+st = conn.stream
+
+# equivalent to expect_too_many_args
+begin
+  st.recvall(1, 2) {|x,y| x = y}
+rescue NoMethodError
+  puts_skipped "#{$test_object}.recvall does not exist"
+rescue ArgumentError => e
+  puts_ok "#{$test_object}.recvall too many args threw #{ArgumentError.to_s}"
+rescue => e
+  puts_fail "#{$test_object}.recvall too many args expected to throw #{ArgumentError.to_s}, but instead threw #{e.class.to_s}: #{e.to_s}"
+else
+  puts_fail "#{$test_object}.recvall too many args expected to throw #{ArgumentError.to_s}, but threw nothing"
+end
+
+expect_fail(st, RuntimeError, "no block given", "recvall")
+
+# FIXME: we need to setup a proper stream for this to work
+#st.recvall {|data,opaque| return opaque}
+
+st.free
+
+# TESTGROUP: stream.event_add_callback
+st_event_callback_proc = lambda {|st,events,opaque|
+}
+
+st = conn.stream
+
+expect_too_many_args(st, "event_add_callback", 1, 2, 3, 4)
+expect_too_few_args(st, "event_add_callback")
+expect_too_few_args(st, "event_add_callback", 1)
+expect_invalid_arg_type(st, "event_add_callback", nil, st_event_callback_proc)
+expect_invalid_arg_type(st, "event_add_callback", 'foo', st_event_callback_proc)
+expect_invalid_arg_type(st, "event_add_callback", [], st_event_callback_proc)
+expect_invalid_arg_type(st, "event_add_callback", {}, st_event_callback_proc)
+expect_invalid_arg_type(st, "event_add_callback", 1, nil)
+expect_invalid_arg_type(st, "event_add_callback", 1, 'foo')
+expect_invalid_arg_type(st, "event_add_callback", 1, 1)
+expect_invalid_arg_type(st, "event_add_callback", 1, [])
+expect_invalid_arg_type(st, "event_add_callback", 1, {})
+
+# FIXME: I get "this function is not support by the connection driver"
+#expect_success(st, "events and callback arg", "event_add_callback", Libvirt::Stream::EVENT_READABLE, st_event_callback_proc)
+#st.event_remove_callback
+
+st.free
+
+# TESTGROUP: stream.event_update_callback
+st = conn.stream
+
+expect_too_many_args(st, "event_update_callback", 1, 2)
+expect_too_few_args(st, "event_update_callback")
+expect_invalid_arg_type(st, "event_update_callback", nil)
+expect_invalid_arg_type(st, "event_update_callback", 'foo')
+expect_invalid_arg_type(st, "event_update_callback", [])
+expect_invalid_arg_type(st, "event_update_callback", {})
+
+# FIXME: we would need to get st.event_add_callback working to get this working
+#expect_success(st, "events arg", "event_update_callback", Libvirt::Stream::EVENT_WRITABLE)
+
+st.free
+
+# TESTGROUP: stream.remove_callback
+st = conn.stream
+
+expect_too_many_args(st, "event_remove_callback", 1)
+
+# FIXME: we would need to get st.event_add_callback working to get this working
+#expect_success(st, "no arg", "event_remove_callback")
+
+st.free
+
+# TESTGROUP: stream.finish
+st = conn.stream
+
+expect_too_many_args(st, "finish", 1)
+
+# FIXME: I get "this function is not support by the connection driver"
+#expect_success(st, "no arg", "finish")
+
+st.free
+
+# TESTGROUP: stream.abort
+st = conn.stream
+
+expect_too_many_args(st, "abort", 1)
+
+# FIXME: I get "this function is not support by the connection driver"
+#expect_success(st, "no arg", "abort")
+
+st.free
+
+# TESTGROUP: stream.abort
+st = conn.stream
+
+expect_too_many_args(st, "free", 1)
+
+expect_success(st, "no arg", "free")
+
+# END TESTS
+
+conn.close
+
+finish_tests

data/tests/test_utils.rb

@@ -2,12 +2,15 @@ $FAIL = 0
 $SUCCESS = 0
 $SKIPPED = 0
 
-$GUEST_DISK = '/var/lib/libvirt/images/ruby-libvirt-tester.qcow2'
+$GUEST_BASE = '/var/lib/libvirt/images/ruby-libvirt-tester'
+$GUEST_DISK = $GUEST_BASE + '.qcow2'
+$GUEST_SAVE = $GUEST_BASE + '.save'
 $GUEST_UUID = "93a5c045-6457-2c09-e56f-927cdf34e17a"
 
 # XML data for later tests
 $new_dom_xml = <<EOF
 <domain type='kvm'>
+  <description>Ruby Libvirt Tester</description>
   <name>ruby-libvirt-tester</name>
   <uuid>#{$GUEST_UUID}</uuid>
   <memory>1048576</memory>
@@ -56,11 +59,14 @@ 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"
 
+$NEW_INTERFACE_MAC = 'aa:bb:cc:dd:ee:ff'
 $new_interface_xml = <<EOF
-<interface type="bridge" name="ruby-libvirt-tester">
+<interface type="ethernet" name="ruby-libvirt-tester">
   <start mode="onboot"/>
-  <bridge delay="0">
-  </bridge>
+  <mac address="#{$NEW_INTERFACE_MAC}"/>
+  <protocol family='ipv4'>
+    <dhcp peerdns='yes'/>
+  </protocol>
 </interface>
 EOF
 
@@ -79,6 +85,10 @@ $new_net_xml = <<EOF
 </network>
 EOF
 
+$new_network_dhcp_ip = <<EOF
+<host mac='00:11:22:33:44:55' ip='192.168.134.5'/>
+EOF
+
 $NWFILTER_UUID = "bd339530-134c-6d07-441a-17fb90dad807"
 $new_nwfilter_xml = <<EOF
 <filter name='ruby-libvirt-tester' chain='ipv4'>
@@ -115,36 +125,41 @@ $new_storage_pool_xml = <<EOF
 </pool>
 EOF
 
+$test_object = "unknown"
+
+def set_test_object(obj)
+  $test_object = obj
+end
+
 def expect_success(object, msg, func, *args)
   begin
-    x = object.send(func, *args)
+    x = object.__send__(func, *args)
     if block_given?
       res = yield x
       if not res
-        # FIXME: generate a proper error here
-        raise "Failed"
+        raise "block failed"
       end
     end
-    puts_ok "#{func} #{msg} succeeded"
+    puts_ok "#{$test_object}.#{func} #{msg} succeeded"
     x
   rescue NoMethodError
-    puts_skipped "#{func} does not exist"
+    puts_skipped "#{$test_object}.#{func} does not exist"
   rescue => e
-    puts_fail "#{func} #{msg} expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
+    puts_fail "#{$test_object}.#{func} #{msg} expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
   end
 end
 
 def expect_fail(object, errtype, errmsg, func, *args)
   begin
-    object.send(func, *args)
+    object.__send__(func, *args)
   rescue NoMethodError
-    puts_skipped "#{func} does not exist"
+    puts_skipped "#{$test_object}.#{func} does not exist"
   rescue errtype => e
-    puts_ok "#{func} #{errmsg} threw #{errtype.to_s}"
+    puts_ok "#{$test_object}.#{func} #{errmsg} threw #{errtype.to_s}"
   rescue => e
-    puts_fail "#{func} #{errmsg} expected to throw #{errtype.to_s}, but instead threw #{e.class.to_s}: #{e.to_s}"
+    puts_fail "#{$test_object}.#{func} #{errmsg} expected to throw #{errtype.to_s}, but instead threw #{e.class.to_s}: #{e.to_s}"
   else
-    puts_fail "#{func} #{errmsg} expected to throw #{errtype.to_s}, but threw nothing"
+    puts_fail "#{$test_object}.#{func} #{errmsg} expected to throw #{errtype.to_s}, but threw nothing"
   end
 end
 
@@ -178,3 +193,59 @@ end
 def finish_tests
   puts "Successfully finished #{$SUCCESS} tests, failed #{$FAIL} tests, skipped #{$SKIPPED} tests"
 end
+
+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
+  return nil
+end
+
+def cleanup_test_domain(conn)
+  # cleanup from previous runs
+  begin
+    olddom = conn.lookup_domain_by_name("ruby-libvirt-tester")
+  rescue
+    # in case we didn't find it, don't do anything
+  end
+
+  begin
+    olddom.destroy
+  rescue
+    # in case we didn't destroy it, don't do anything
+  end
+
+  begin
+    olddom.undefine(Libvirt::Domain::UNDEFINE_SNAPSHOTS_METADATA)
+  rescue
+    # in case we didn't undefine it, don't do anything
+  end
+
+  `rm -f #{$GUEST_DISK}`
+  `rm -f #{$GUEST_SAVE}`
+end
+
+def cleanup_test_network(conn)
+  # initial cleanup for previous run
+  begin
+    oldnet = conn.lookup_network_by_name("ruby-libvirt-tester")
+  rescue
+    # in case we didn't find it, don't do anything
+  end
+
+  begin
+    oldnet.destroy
+  rescue
+    # in case we didn't find it, don't do anything
+  end
+
+  begin
+    oldnet.undefine
+  rescue
+    # in case we didn't find it, don't do anything
+  end
+end

metadata

@@ -1,106 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-libvirt
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - David Lutterkort, Chris Lalancette
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-29 00:00:00 -04:00
-default_executable: 
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby bindings for libvirt.
 email: libvir-list@redhat.com
 executables: []
-
-extensions: 
+extensions:
 - ext/libvirt/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - COPYING
 - README
 - NEWS
 - README.rdoc
 - lib/libvirt.rb
-- ext/libvirt/domain.h
-- ext/libvirt/domain.c
-- ext/libvirt/network.h
-- ext/libvirt/secret.c
-- ext/libvirt/secret.h
-- ext/libvirt/stream.h
-- ext/libvirt/storage.h
-- ext/libvirt/storage.c
 - ext/libvirt/_libvirt.c
-- ext/libvirt/interface.h
-- ext/libvirt/network.c
-- ext/libvirt/nwfilter.c
-- ext/libvirt/connect.h
+- ext/libvirt/common.c
 - ext/libvirt/common.h
 - ext/libvirt/connect.c
-- ext/libvirt/common.c
+- ext/libvirt/connect.h
+- ext/libvirt/domain.c
+- ext/libvirt/domain.h
 - ext/libvirt/interface.c
-- ext/libvirt/nodedevice.h
+- ext/libvirt/interface.h
+- ext/libvirt/network.c
+- ext/libvirt/network.h
 - ext/libvirt/nodedevice.c
-- ext/libvirt/stream.c
+- ext/libvirt/nodedevice.h
+- ext/libvirt/nwfilter.c
 - ext/libvirt/nwfilter.h
+- ext/libvirt/secret.c
+- ext/libvirt/secret.h
+- ext/libvirt/storage.c
+- ext/libvirt/storage.h
+- ext/libvirt/stream.c
+- ext/libvirt/stream.h
 - ext/libvirt/extconf.rb
+- tests/test_conn.rb
+- tests/test_domain.rb
 - tests/test_interface.rb
 - tests/test_network.rb
+- tests/test_nodedevice.rb
 - tests/test_nwfilter.rb
-- tests/test_utils.rb
-- tests/test_domain.rb
-- tests/test_storage.rb
 - tests/test_open.rb
 - tests/test_secret.rb
-- tests/test_conn.rb
-- tests/test_nodedevice.rb
-has_rdoc: true
+- tests/test_storage.rb
+- tests/test_stream.rb
+- tests/test_utils.rb
 homepage: http://libvirt.org/ruby/
-licenses: []
-
+licenses:
+- LGPLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 8
-      - 1
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: None
-rubygems_version: 1.3.7
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for LIBVIRT
 test_files: []
-