DBus Menu

Merge lp:~ted/libdbusmenu/test_update into lp:libdbusmenu/0.5

  1. test_update
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/libdbusmenu/test_update
Merge into: lp:libdbusmenu/0.5
Diff against target: 295 lines
7 files modified
.bzrignore (+1/-0)
configure.ac (+0/-1)
tests/Makefile.am (+44/-6)
tests/dbusmenu-gtk/Makefile.am (+0/-43)
tests/dbusmenu-gtk/dbusMenuTest (+1/-1)
tests/dbusmenu-gtk/mago_tests/dbusmenu.py (+2/-2)
tests/dbusmenu-gtk/mago_tests/dbusmenu.xml (+10/-10)
To merge this branch: bzr merge lp:~ted/libdbusmenu/test_update
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+13174@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Fixes to the test system so it calls Mago and also can do distcheck.

Revision history for this message
Cody Russell (bratsche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-10-06 17:01:48 +0000
3+++ .bzrignore 2009-10-10 19:55:18 +0000
4@@ -51,3 +51,4 @@
5 tools/dbusmenu-dumper
6 libdbusmenu-[0-9].[0-9].[0-9].tar.gz
7 libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc
8+tests/test-mago
9
10=== modified file 'configure.ac'
11--- configure.ac 2009-10-06 17:01:48 +0000
12+++ configure.ac 2009-10-10 19:55:18 +0000
13@@ -108,7 +108,6 @@
14 libdbusmenu-qt/dbusmenu-qt.pc
15 tools/Makefile
16 tests/Makefile
17-tests/dbusmenu-gtk/Makefile
18 ])
19
20 ###########################
21
22=== modified file 'tests/Makefile.am'
23--- tests/Makefile.am 2009-10-02 21:50:56 +0000
24+++ tests/Makefile.am 2009-10-10 19:55:18 +0000
25@@ -1,8 +1,8 @@
26-SUBDIRS = dbusmenu-gtk
27
28 DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
29
30 TESTS = \
31+ test-mago \
32 test-glib-layout \
33 test-glib-properties \
34 test-gtk-label \
35@@ -35,7 +35,7 @@
36 # Test Glib Layout
37 ######################
38
39-test-glib-layout: test-glib-layout-client test-glib-layout-server
40+test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
41 @echo "#!/bin/sh" > test-glib-layout
42 @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> test-glib-layout
43 @chmod +x test-glib-layout
44@@ -69,7 +69,7 @@
45 # Test Glib Properties
46 ######################
47
48-test-glib-properties: test-glib-properties-client test-glib-properties-server
49+test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am
50 @echo "#!/bin/sh" > test-glib-properties
51 @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> test-glib-properties
52 @chmod +x test-glib-properties
53@@ -117,7 +117,7 @@
54 # Test GTK Label
55 #########################
56
57-test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json
58+test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am
59 @echo "#!/bin/sh" > test-gtk-label
60 @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-label
61 @chmod +x test-gtk-label
62@@ -156,7 +156,7 @@
63 # Test GTK Reorder
64 #########################
65
66-test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server
67+test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am
68 @echo "#!/bin/sh" > test-gtk-reorder
69 @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-reorder
70 @chmod +x test-gtk-reorder
71@@ -176,6 +176,18 @@
72 $(DBUSMENUGTK_LIBS) \
73 $(DBUSMENUTESTS_LIBS)
74
75+#########################
76+# Test Mago
77+#########################
78+
79+test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am
80+ @echo "#!/bin/sh" > test-mago
81+ @echo cd $(srcdir)/dbusmenu-gtk >> test-mago
82+ @echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago
83+ @echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago
84+ @echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> test-mago
85+ @echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> test-mago
86+ @chmod +x test-mago
87
88 #########################
89 # Other
90@@ -188,7 +200,33 @@
91
92 EXTRA_DIST = \
93 $(examples_DATA) \
94- test-gtk-label.json
95+ test-gtk-label.json \
96+ dbusmenu-gtk/dbusMenuTest \
97+ dbusmenu-gtk/mago_tests/dbusmenu.xml \
98+ dbusmenu-gtk/mago_tests/dbusmenu.py \
99+ dbusmenu-gtk/mago_tests/data/blank_label_2levels.json \
100+ dbusmenu-gtk/mago_tests/data/blank_label.json \
101+ dbusmenu-gtk/mago_tests/data/blank_submenus.json \
102+ dbusmenu-gtk/mago_tests/data/dynamic.json \
103+ dbusmenu-gtk/mago_tests/data/long_label.json \
104+ dbusmenu-gtk/mago_tests/data/no_id.json \
105+ dbusmenu-gtk/mago_tests/data/no_label.json \
106+ dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json \
107+ dbusmenu-gtk/mago_tests/data/sameid_submenus.json \
108+ dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json \
109+ dbusmenu-gtk/mago_tests/data/sameid_topmenu.json \
110+ dbusmenu-gtk/mago_tests/data/several_submenus.json \
111+ dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \
112+ dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \
113+ dbusmenu-gtk/mago_tests/data/static.json \
114+ dbusmenu-gtk/mago_tests/data/test-gtk-label.json
115+
116+CLEANFILES = \
117+ dbusmenu-gtk/mago_tests/dbusmenu.xml \
118+ dbusmenu-gtk/mago_tests/dbusmenu.pyc
119+
120+distclean-local:
121+ -rm -rf $(builddir)/dbusmenu-gtk/mago.results
122
123 DISTCLEANFILES = \
124 $(TESTS)
125
126=== removed file 'tests/dbusmenu-gtk/Makefile.am'
127--- tests/dbusmenu-gtk/Makefile.am 2009-10-07 10:55:40 +0000
128+++ tests/dbusmenu-gtk/Makefile.am 1970-01-01 00:00:00 +0000
129@@ -1,43 +0,0 @@
130-
131-check: tests
132-
133-tests: mago
134-
135-mago: dbusmenu.xml dbusmenu.py
136- PYTHONPATH=$(builddir) mago -f dbusmenu.xml -t $(builddir)/mago.results
137-
138-dbusmenu.xml: dbusmenu.xml.in
139- sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@
140-
141-dbusmenu.py: dbusmenu.py.in
142- sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@
143-
144-EXTRA_DIST = \
145- dbusmenu.xml.in \
146- dbusmenu.py.in \
147- dbusMenuTest \
148- mago_tests/data/blank_label_2levels.json \
149- mago_tests/data/blank_label.json \
150- mago_tests/data/blank_submenus.json \
151- mago_tests/data/dynamic.json \
152- mago_tests/data/long_label.json \
153- mago_tests/data/no_id.json \
154- mago_tests/data/no_label.json \
155- mago_tests/data/sameid_submenus_diff_sizes.json \
156- mago_tests/data/sameid_submenus.json \
157- mago_tests/data/sameid_top_and_submenus.json \
158- mago_tests/data/sameid_topmenu.json \
159- mago_tests/data/several_submenus.json \
160- mago_tests/data/several_submenus_recursive.json \
161- mago_tests/data/several_submenus_utf8.json \
162- mago_tests/data/static.json \
163- mago_tests/data/test-gtk-label.json
164-
165-CLEANFILES = \
166- mago_tests/dbusmenu.xml \
167- mago_tests/dbusmenu.pyc \
168- mago_tests/dbusmenu.py
169-
170-distclean-local:
171- -rm -rf $(builddir)/mago.results
172-
173
174=== modified file 'tests/dbusmenu-gtk/dbusMenuTest'
175--- tests/dbusmenu-gtk/dbusMenuTest 2009-10-07 10:55:40 +0000
176+++ tests/dbusmenu-gtk/dbusMenuTest 2009-10-10 19:55:18 +0000
177@@ -3,6 +3,6 @@
178 export NO_GAIL=0
179 export NO_AT_BRIDGE=0
180
181-dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task ../test-gtk-label-client --task-name Client --task ../test-gtk-label-server --parameter ./mago_tests/$1 --task-name Server --ignore-return
182+dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task $INDICATOR_BUILD_DIR/test-gtk-label-client --task-name Client --task $INDICATOR_BUILD_DIR/test-gtk-label-server --parameter ./mago_tests/$1 --task-name Server --ignore-return
183
184
185
186=== renamed file 'tests/dbusmenu-gtk/dbusmenu.py.in' => 'tests/dbusmenu-gtk/mago_tests/dbusmenu.py'
187--- tests/dbusmenu-gtk/dbusmenu.py.in 2009-06-25 14:13:27 +0000
188+++ tests/dbusmenu-gtk/mago_tests/dbusmenu.py 2009-10-10 19:55:18 +0000
189@@ -1,10 +1,10 @@
190 from mago.test_suite.main import SingleApplicationTestSuite
191 from mago.application.main import Application
192
193-import ldtp, ooldtp, ldtputils
194+import ldtp, ooldtp, ldtputils, os.path
195
196 class DbusMenuGtkApp():
197- LAUNCHER = "@srcdir@/dbusMenuTest"
198+ LAUNCHER = os.path.join(os.path.dirname(__file__), "..", "dbusMenuTest")
199 WINDOW = "frmlibdbusmenu-gtktest"
200
201 def open(self, menu_schema=''):
202
203=== renamed file 'tests/dbusmenu-gtk/dbusmenu.xml.in' => 'tests/dbusmenu-gtk/mago_tests/dbusmenu.xml'
204--- tests/dbusmenu-gtk/dbusmenu.xml.in 2009-06-24 17:47:16 +0000
205+++ tests/dbusmenu-gtk/mago_tests/dbusmenu.xml 2009-10-10 19:55:18 +0000
206@@ -8,7 +8,7 @@
207 <method>testStaticMenu</method>
208 <description>Simple check for a menu </description>
209 <args>
210- <menu_schema>@srcdir@/data/static.json</menu_schema>
211+ <menu_schema>data/static.json</menu_schema>
212 <menu_item>value39</menu_item>
213 </args>
214 </case>
215@@ -16,7 +16,7 @@
216 <method>testStaticMenu</method>
217 <description>Blank Label</description>
218 <args>
219- <menu_schema>@srcdir@/data/blank_label.json</menu_schema>
220+ <menu_schema>data/blank_label.json</menu_schema>
221 <menu_item></menu_item>
222 </args>
223 </case>
224@@ -24,7 +24,7 @@
225 <method>testSubmenus</method>
226 <description>Blank Submenus</description>
227 <args>
228- <menu_schema>@srcdir@/data/blank_submenus.json</menu_schema>
229+ <menu_schema>data/blank_submenus.json</menu_schema>
230 <menu_item>value6</menu_item>
231 <submenus></submenus>
232 </args>
233@@ -33,7 +33,7 @@
234 <method>testStaticMenu</method>
235 <description>Really Long Label (1000 chars)</description>
236 <args>
237- <menu_schema>@srcdir@/data/long_label.json</menu_schema>
238+ <menu_schema>data/long_label.json</menu_schema>
239 <menu_item>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</menu_item>
240 </args>
241 </case>
242@@ -41,7 +41,7 @@
243 <method>testStaticMenu</method>
244 <description>Search for a submenu that comes from a menu without ID</description>
245 <args>
246- <menu_schema>@srcdir@/data/no_id.json</menu_schema>
247+ <menu_schema>data/no_id.json</menu_schema>
248 <menu_item>submenu_from_no_id</menu_item>
249 </args>
250 </case>
251@@ -49,7 +49,7 @@
252 <method>testStaticMenu</method>
253 <description>Search for a submenu that comes from a menu with a blank label</description>
254 <args>
255- <menu_schema>@srcdir@/data/blank_label_2levels.json</menu_schema>
256+ <menu_schema>data/blank_label_2levels.json</menu_schema>
257 <menu_item>value10</menu_item>
258 </args>
259 </case>
260@@ -57,7 +57,7 @@
261 <method>testStaticMenu</method>
262 <description>Be sure that a submenu from a menu without label does not exist</description>
263 <args>
264- <menu_schema>@srcdir@/data/no_label.json</menu_schema>
265+ <menu_schema>data/no_label.json</menu_schema>
266 <menu_item>submenu_from_no_label</menu_item>
267 <notexists>True</notexists>
268 </args>
269@@ -66,7 +66,7 @@
270 <method>testStaticMenu</method>
271 <description>Check that a submenu is shown</description>
272 <args>
273- <menu_schema>@srcdir@/data/several_submenus.json</menu_schema>
274+ <menu_schema>data/several_submenus.json</menu_schema>
275 <menu_item>value10</menu_item>
276 </args>
277 </case>
278@@ -74,7 +74,7 @@
279 <method>testStaticMenu</method>
280 <description>Be sure that a submenu from a 4th level depth, is shown</description>
281 <args>
282- <menu_schema>@srcdir@/data/several_submenus_recursive.json</menu_schema>
283+ <menu_schema>data/several_submenus_recursive.json</menu_schema>
284 <menu_item>value7001</menu_item>
285 </args>
286 </case>
287@@ -82,7 +82,7 @@
288 <method>testStaticMenu</method>
289 <description>Be sure that a submenu, with a UTF-8 label, is shown</description>
290 <args>
291- <menu_schema>@srcdir@/data/several_submenus_utf8.json</menu_schema>
292+ <menu_schema>data/several_submenus_utf8.json</menu_schema>
293 <menu_item>value5ス</menu_item>
294 </args>
295 </case>

Subscribers

People subscribed via source and target branches