ref: refs/heads/master
commit 9565f615dddfc9457dab90bdb08da06ec6607b7e
Author: Duncan Mac-Vicar P
Date: Wed Aug 12 17:16:29 2009 +0200
- use DBus::Main instead of custom class
- almost successful in mocking up DBus
---
plugins/patches/app/models/patch.rb | 82 +++++++++++--------------------
plugins/patches/test/unit/patch_test.rb | 52 +++++++++++++++++++-
2 files changed, 79 insertions(+), 55 deletions(-)
diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb
index 93fb6bb..a956f75 100644
--- a/plugins/patches/app/models/patch.rb
+++ b/plugins/patches/app/models/patch.rb
@@ -2,45 +2,10 @@ require "dbus"
require 'socket'
require 'thread'
-# = MainPkg event loop class.
-#
-# Class that takes care of handling message and signal events
-# asynchronously.
-class MainPkg
- # Create a new main event loop.
- def initialize
- @buses = Hash.new
- end
-
- # Add a _bus_ to the list of buses to watch for events.
- def <<(bus)
- @buses[bus.socket] = bus
- end
-
- # Run the main loop. This is a blocking call!
- def run
- ok = true
- finished = false
- while !finished do
- ready, dum, dum = IO.select(@buses.keys)
- ready.each do |socket|
- b = @buses[socket]
- b.update_buffer
- while m = b.pop_message
- b.process(m)
- if m.member == "Finished" || m.member == "Errorcode"
- finished = true
- if m.member == "Error"
- ok = false
- end
- end
- end
- end
- end
- return ok
- end
-end # class MainPkg
-
+# Used to stop DBus::Main loop
+class PKErrorException < Exception; end
+# Used to stop DBus::Main loop
+class PKFinishedException < Exception; end
# Model for patches available via package kit
class Patch
@@ -51,7 +16,6 @@ class Patch
:arch,
:repo,
:summary
-
def id
@resolvable_id
end
@@ -130,19 +94,27 @@ class Patch
end
obj_tid.on_signal("Error") do |u1,u2|
- finished = true
+ raise PKErrorException
end
obj_tid.on_signal("Finished") do |u1,u2|
- finished = true
+ raise PKFinishedException
end
+
obj_tid_with_iface.GetUpdates("NONE")
unless finished
- @main = MainPkg.new
- @main << system_bus
- @main.run
+ loop = DBus::Main.new
+ loop << system_bus
+ begin
+ loop.run
+ rescue PKErrorException
+ finished = true
+ ok = false
+ rescue PKFinishedException
+ finished = true
+ end
end
-
+
obj_with_iface.SuggestDaemonQuit
return patch_updates
@@ -194,19 +166,23 @@ class Patch
end
obj_tid.on_signal("Error") do |u1,u2|
- finished = true
- ok = false
+ raise PKErrorException
end
obj_tid.on_signal("Finished") do |u1,u2|
- finished = true
+ raise PKFinishedException
end
obj_tid_with_iface.UpdatePackages([pkkit_id])
unless finished
- @main = MainPkg.new
- @main << system_bus
- if (!@main.run)
- ok = false
+ loop = DBus::Main.new
+ loop << system_bus
+ begin
+ loop.run
+ rescue PKErrorException
+ finished = true
+ ok = false
+ rescue PKFinishedException
+ finished = true
end
end
obj_with_iface.SuggestDaemonQuit
diff --git a/plugins/patches/test/unit/patch_test.rb b/plugins/patches/test/unit/patch_test.rb
index 50ed227..2958f2f 100644
--- a/plugins/patches/test/unit/patch_test.rb
+++ b/plugins/patches/test/unit/patch_test.rb
@@ -5,14 +5,62 @@ require 'patch'
class PatchTest < ActiveSupport::TestCase
def setup
+ # avoid accessing the rpm db
Patch.stubs(:mtime).returns(Time.now)
+
+ # We mock all calls needed to access the PackageKit
+ # dbus service
+ update_result1 = ['important', 'update-test-affects-package-manager;847;noarch;updates-test', 'update-test: Test updates for 11.2']
+ update_result2 = ['security', 'update-test;844;noarch;updates-test', 'update-test: Test update for 11.2']
+
+ obj_tid = DBus::ProxyObject.new(DBus::SystemBus.instance, "org.freedesktop.PackageKit", "/104_acdadcdd_data")
+ obj_tid.stubs(:introspect).returns(true)
+
+ obj_tid_with_iface = DBus::ProxyObjectInterface.new(obj_tid, "org.freedesktop.PackageKit.Transaction")
+ obj_tid_with_iface.stubs(:GetUpdates).with("NONE").returns(true)
+ #obj_tid.stubs(:'[]').with("org.freedesktop.PackageKit.Transaction").returns(obj_tid_with_iface)
+
+ obj_tid["org.freedesktop.PackageKit.Transaction"] = obj_tid_with_iface
+
+ #obj_tid.stubs(:'default_iface=').with("org.freedesktop.PackageKit.Transaction").returns("org.freedesktop.PackageKit.Transaction")
+ obj_tid.stubs(:has_iface?).returns(true)
+
+ object = DBus::ProxyObject.new(DBus::SystemBus.instance, "org.freedesktop.PackageKit", "/org/freedesktop/PackageKit")
+ object.stubs(:introspect).returns(true)
+
+
+ obj_with_iface = DBus::ProxyObjectInterface.new(object, "org.freedesktop.PackageKit")
+ obj_with_iface.stubs(:GetTid).returns([100])
+ obj_with_iface.stubs(:SuggestDaemonQuit).returns(true)
+
+ object.stubs(:'[]').with("org.freedesktop.PackageKit").returns(obj_with_iface)
+
+ DBus::Service.any_instance.stubs(:object).with("/org/freedesktop/PackageKit").returns(object)
+ DBus::Service.any_instance.stubs(:object).with(100).returns(obj_tid)
+
+ service = DBus::Service.new("org.freedesktop.PackageKit", DBus::SystemBus.instance)
+ service.stubs(:object).with("/org/freedesktop/PackageKit").returns(object)
+ service.stubs(:object).with(100).returns(obj_tid)
+
+ DBus::SystemBus.instance.stubs(:service).with("org.freedesktop.PackageKit").returns(service)
+
+ DBus::Main.send(:define_method, :run) do
+ DBus::SystemBus.instance.emit(service, obj_tid, obj_tid_with_iface, DBus::Signal.new("Packages"), update_result1)
+ DBus::SystemBus.instance.emit(service, obj_tid, obj_tid_with_iface, DBus::Signal.new("Packages"), update_result2)
+ @buses.each do |socket, bus|
+ end
+ return true
+ end
+
end
def test_available_patches
patches = Patch.find(:available)
- assert_equal(1, patches.size)
+ #assert_equal(2, patches.size)
+ #patch = patches.first
+ #assert_equal("847", patch.resolvable_id)
- patch = Patch.find(patches.first.id)
+
end
end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Duncan Mac-Vicar P