From 21daa86bcb386240a1902c0bbad960285c900bcf Mon Sep 17 00:00:00 2001
From: erick <erick@sugar-dev-erick.(none)>
Date: Sun, 06 Dec 2009 20:07:51 +0000
Subject: Merge branch 'frame_integration'

Conflicts:
	tutorius/overlayer.py
---
(limited to 'tests/probetests.py')

diff --git a/tests/probetests.py b/tests/probetests.py
index 17c6afc..357d223 100644
--- a/tests/probetests.py
+++ b/tests/probetests.py
@@ -187,7 +187,8 @@ class ProbeTest(unittest.TestCase):
 
         #Setup the activity and probe
         self.activity = MockActivity()
-        self.probe = TProbe(self.activity, MockServiceProxy())
+        self.probe = TProbe(self.activity, self.activity.get_bundle_id(), 
+                            self.activity.get_id(), service_proxy=MockServiceProxy())
 
         #Override the eventOccured on the Probe...
         self.old_eO = self.probe.eventOccured
--
cgit v0.9.1