From b889f44c6adeaf10d5e1ae0a2e69ef5ee218ccad Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@src.gnome.org>
Date: Sat, 17 Jul 2004 16:38:46 +0000
Subject: gtk/*.override

	* gtk/*.override
	* codegen/codegen.py:
	* codegen/argtypes.py: Update for enums

	* pygtype.c (pyg_value_as_pyobject): Use new enum/flag functions

	* pygenum.[ch]: Handle GFlag

	* pygflags.[ch]: Handle GFlag

	* atk-types.defs: Fix gtype-id for all enums

	* gobjectmodule.c (initgobject): Clean up and add convinience macros

	* tests/enum.py: New file

	* tests/common.py: New file, also stole from gst-python
---
 tests/Makefile.am   |  1 +
 tests/common.py     | 16 ++++++++++++++++
 tests/conversion.py |  2 +-
 tests/runtests.py   |  2 +-
 tests/signal.py     |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 tests/common.py

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8324aef..c592b96 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,6 @@
 tests =  \
 	conversion.py \
+	enum.py \
 	signal.py
 
 check-local:
diff --git a/tests/common.py b/tests/common.py
new file mode 100644
index 0000000..ff2eef9
--- /dev/null
+++ b/tests/common.py
@@ -0,0 +1,16 @@
+import os
+import sys
+
+# Don't insert before . (first in list)
+sys.path.insert(1, os.path.join('..'))
+
+path = os.path.abspath(os.path.join('..', 'gtk'))
+import gobject
+import atk
+import pango
+import gtk
+from gtk import gdk
+from gtk import glade
+
+import ltihooks
+ltihooks.uninstall()
diff --git a/tests/conversion.py b/tests/conversion.py
index 1fe8c22..dece7bd 100644
--- a/tests/conversion.py
+++ b/tests/conversion.py
@@ -2,7 +2,7 @@
 
 import unittest
 
-import gtk
+from common import gtk
 
 class Tests(unittest.TestCase):
   
diff --git a/tests/runtests.py b/tests/runtests.py
index f3559f5..83b6013 100644
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -4,7 +4,7 @@ import os
 import sys
 import unittest
 
-SKIP_FILES = ['runtests']
+SKIP_FILES = ['common', 'runtests']
 
 dir = os.path.split(os.path.abspath(__file__))[0]
 os.chdir(dir)
diff --git a/tests/signal.py b/tests/signal.py
index ce32801..65eda26 100644
--- a/tests/signal.py
+++ b/tests/signal.py
@@ -2,7 +2,7 @@
 
 import unittest
 
-import gobject
+from common import gobject
 
 class C(gobject.GObject):
     __gsignals__ = { 'my_signal': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-- 
cgit