Imported Upstream version 1.9.16

4 files changed, 29 insertions, 11 deletions

diff --git a/tests/test_Entry.py b/tests/test_Entry.py
index 77dec56..02c3fc0 100644
--- a/tests/test_Entry.py
+++ b/tests/test_Entry.py
@@ -140,5 +140,10 @@ class EntryTest(unittest.TestCase):
             gtk.main_iteration()
         self.assertEqual(entry.get_property('data_type'), int)
 
+    def testCorrectlySetsEmptyString(self):
+        entry = ProxyEntry()
+        entry.update('')
+        self.assertEqual(entry.read(), '')
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_proxy.py b/tests/test_proxy.py
index e004b67..6d70c85 100644
--- a/tests/test_proxy.py
+++ b/tests/test_proxy.py
@@ -152,11 +152,11 @@ class TestProxy(unittest.TestCase):
         self.assertEqual(self.view.entry.read(), ValueUnset)
         self.assertEqual(self.view.checkbutton.read(), False)
         self.assertEqual(self.view.radiobutton.read(), 'first')
-        self.assertEqual(self.view.label.read(), '')
-        self.assertEqual(self.view.spinbutton.read(), ValueUnset)
-        self.assertEqual(self.view.textview.read(), '')
-        self.assertEqual(self.view.comboentry.read(), None)
-        self.assertEqual(self.view.combobox.read(), 'CB1')
+        self.assertEqual(self.view.label.read(), '', 'label')
+        self.assertEqual(self.view.spinbutton.read(), ValueUnset, 'spinbutton')
+        self.assertEqual(self.view.textview.read(), ValueUnset, 'textview')
+        self.assertEqual(self.view.comboentry.read(), None, 'comboentry')
+        self.assertEqual(self.view.combobox.read(), 'CB1', 'combobox')
 
     def testValueUnset(self):
         self.view.entry.update(ValueUnset)
diff --git a/tests/test_tasklet.py b/tests/test_tasklet.py
index 41c8163..135654e 100644
--- a/tests/test_tasklet.py
+++ b/tests/test_tasklet.py
@@ -37,6 +37,21 @@ class TestWaitForSignal(unittest.TestCase):
         self.assertEqual(task.state, tasklet.Tasklet.STATE_ZOMBIE)
         self.assertEqual(task.return_value, "return-val")
 
+    if hasattr(gobject, 'add_emission_hook'):
+        def testEmissionHook(self):
+            obj = C()
+
+            def some_task():
+                yield tasklet.WaitForSignal(C, 'my-signal')
+                tasklet.get_event()
+                raise StopIteration("return-val")
+
+            task = tasklet.run(some_task())
+            obj.emit("my-signal", 1)
+            self.assertEqual(task.state, tasklet.Tasklet.STATE_ZOMBIE)
+            self.assertEqual(task.return_value, "return-val")
+
+
 class TestWaitForTimeout(unittest.TestCase):
     def time(self):
         if sys.platform == 'win32':
diff --git a/tests/test_ui.py b/tests/test_ui.py
index 8f03895..dba0ee3 100644
--- a/tests/test_ui.py
+++ b/tests/test_ui.py
@@ -24,15 +24,14 @@ def create():
     testdir = os.path.dirname(__file__)
     uidir = os.path.join(testdir, 'ui')
     rootdir = os.path.dirname(testdir)
-
     tests = {}
     tests['setUp'] = lambda self, rootdir=rootdir: setup(self, rootdir)
     tests['tearDown'] = lambda self, rootdir=rootdir: teardown(self)
 
     for filename in os.listdir(uidir):
-        if not filename.endswith('.py'):
+        if not filename.endswith('.doctest'):
             continue
-        name = 'test_' + filename[:-3]
+        name = 'test_' + filename[:-7]
 
         full = os.path.join(uidir, filename)
 
@@ -42,10 +41,9 @@ def create():
         except TypeError:
             pass
         tests[name] = func
-
     return type('TestUI', (unittest.TestCase,), tests)
 
 # Disable UI tests on win32, they do not quite work yet.
-#if sys.platform != 'win32':
-TestUI = create()
+if sys.platform != 'win32':
+    TestUI = create()