Merge lp:~mhr3/libunity/fix-1062331 into lp:libunity

[Michal Hruby]

Fix AsyncPreview.preview_ready not being usable from pygi

Fixes issue where AsyncPreview.preview_ready wasn't usable from pygi. Also adds infrastructure for running pygi tests.

[Paweł Stołowski (stolowski)]

LGTM. Python test passes.

review: Approve

=== modified file 'Makefile.decl'
--- Makefile.decl	2011-11-29 09:13:49 +0000
+++ Makefile.decl	2012-10-09 09:29:08 +0000
@@ -3,8 +3,8 @@
 # This file is copied almost verbatim from the GLib-2.0 distribution
 #
 
-GTESTER = gtester 			# for non-GLIB packages
-GTESTER_REPORT = $(top_builddir)/test/gtester-report	# for the GLIB package
+GTESTER = gtester
+GTESTER_REPORT = gtester-report
 
 # initialize variables for unconditional += appending
 EXTRA_DIST =
@@ -13,12 +13,16 @@
 ### testing rules
 
 # test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-	@ for subdir in $(SUBDIRS) ; do \
+test: test-nonrecursive
+	@ for subdir in $(SUBDIRS) . ; do \
 	    test "$$subdir" = "." -o "$$subdir" = "po" || \
 	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
 	  done
+
+# test-nonrecursive: run tests only in cwd
+test-nonrecursive: ${TEST_PROGS}
+	@test -z "${TEST_PROGS}" || G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
+
 # test-report: run tests in subdirs and generate report
 # perf-report: run tests in subdirs with -m perf and generate report
 # full-report: like test-report: with -m perf and -m slow
@@ -40,13 +44,19 @@
 	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
 	    ignore_logdir=false ; \
 	  fi ; \
-	  for subdir in $(SUBDIRS) ; do \
+	  REVISION=$(VERSION) ; \
+	  for subdir in $(SUBDIRS) . ; do \
 	    test "$$subdir" = "." -o "$$subdir" = "po" || \
 	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
 	  done ; \
 	  $$ignore_logdir || { \
-	    echo '<?xml version="1.0"?>' > $@.xml ; \
-	    echo '<report-collection>'  >> $@.xml ; \
+	    echo '<?xml version="1.0"?>'              > $@.xml ; \
+	    echo '<report-collection>'               >> $@.xml ; \
+	    echo '<info>'                            >> $@.xml ; \
+	    echo '  <package>$(PACKAGE)</package>'   >> $@.xml ; \
+	    echo '  <version>$(VERSION)</version>'   >> $@.xml ; \
+	    echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
+	    echo '</info>'                           >> $@.xml ; \
 	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
 	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
 	    done ; \
@@ -55,12 +65,11 @@
 	    rm -rf "$$GTESTER_LOGDIR"/ ; \
 	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
 	  }
-.PHONY: test test-report perf-report full-report
+.PHONY: test test-report perf-report full-report test-nonrecursive
 
-# Run tests as part of make check
+# run tests in cwd as part of make check
 if ENABLE_HEADLESS_TESTS
 check-local: test-headless
 else
-check-local: test
+check-local: test-nonrecursive
 endif
-
 
=== modified file 'configure.ac'
--- configure.ac	2012-10-03 06:21:02 +0000
+++ configure.ac	2012-10-09 09:29:08 +0000
@@ -243,6 +243,7 @@
 test/Makefile
 test/C/Makefile
 test/vala/Makefile
+test/python/Makefile
 vapi/Makefile
 ])
 
 
=== modified file 'src/unity-previews.vala'
--- src/unity-previews.vala	2012-10-02 15:18:03 +0000
+++ src/unity-previews.vala	2012-10-09 09:29:08 +0000
@@ -691,7 +691,7 @@
   public signal void preview_ready (Preview? preview);
 
   // simple emit method, so it's easy to use in C/Python
-  [CCode (name = "unity_async_preview_preview_ready")]
+  [CCode (cname = "unity_async_preview_preview_ready")]
   public void emit_preview_ready (Preview? preview)
     requires (!(preview is AsyncPreview))
   {
 
=== modified file 'test/C/Makefile.am'
--- test/C/Makefile.am	2011-01-11 21:37:07 +0000
+++ test/C/Makefile.am	2012-10-09 09:29:08 +0000
@@ -0,0 +1,2 @@
+include $(top_srcdir)/Makefile.decl
+
 
=== modified file 'test/Makefile.am'
--- test/Makefile.am	2011-12-05 12:18:16 +0000
+++ test/Makefile.am	2012-10-09 09:29:08 +0000
@@ -1,4 +1,6 @@
-SUBDIRS = vala C
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = vala C python
 
 EXTRA_DIST = \
   data/applications/ubuntu-about.desktop \
 
=== added directory 'test/python'
=== added file 'test/python/Makefile.am'
--- test/python/Makefile.am	1970-01-01 00:00:00 +0000
+++ test/python/Makefile.am	2012-10-09 09:29:08 +0000
@@ -0,0 +1,41 @@
+include $(top_srcdir)/Makefile.decl
+
+TESTS = bug-1062331.py
+TEST_EXTENSIONS = .py
+
+# gtester doesn't care about our TESTS_ENVIRONMENT, so can't use it
+#TEST_PROGS = $(TESTS)
+
+TESTS_ENVIRONMENT = \
+	GI_TYPELIB_PATH=$(top_builddir)/src:$$GI_TYPELIB_PATH; \
+	export GI_TYPELIB_PATH; \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH; \
+	export LD_LIBRARY_PATH; \
+	$(NULL)
+PY_LOG_COMPILER = $(PYTHON)
+AM_PY_LOG_FLAGS =
+
+# START HEADLESS TESTS
+if ENABLE_HEADLESS_TESTS
+DISPLAY = :27
+LOG_PATH = headless-logs
+test-headless:
+	set -e; \
+	export DISPLAY=$(DISPLAY); \
+	rm -rf $(LOG_PATH); \
+	mkdir $(LOG_PATH); \
+	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
+	sleep 1; \
+	\
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
+	sleep 1; \
+	\
+	make test; \
+	sleep 1; \
+	\
+	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
+	pkill Xvfb;
+	
+endif
+# END HEADLESS TESTS
 
=== added file 'test/python/bug-1062331.py'
--- test/python/bug-1062331.py	1970-01-01 00:00:00 +0000
+++ test/python/bug-1062331.py	2012-10-09 09:29:08 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+from gi.repository import Unity
+
+async_preview = Unity.AsyncPreview.new()
+generic_preview = Unity.GenericPreview.new("Title", "Description", None)
+
+# Check that preview-ready emitter works correctly
+async_preview.preview_ready(generic_preview)
 
=== modified file 'test/vala/test-mpris-backend-prop-updates-client.vala'
--- test/vala/test-mpris-backend-prop-updates-client.vala	2011-11-25 13:05:58 +0000
+++ test/vala/test-mpris-backend-prop-updates-client.vala	2012-10-09 09:29:08 +0000
@@ -302,9 +302,11 @@
   {    
   }*/
 
+  private const string RB_NAME = "org.mpris.MediaPlayer2.rhythmbox";
+
   internal static void player_property_updates_playback_status ()
   {
-    Mpris2Controller controller = new Mpris2Controller ("org.mpris.MediaPlayer2.rhythmbox");   
+    Mpris2Controller controller = new Mpris2Controller (RB_NAME);
     controller.player.PlayPause();
 
     Timeout.add_seconds (2, () => {
@@ -318,7 +320,7 @@
   
   internal static void player_property_updates_metadata()
   {
-    Mpris2Controller controller = new Mpris2Controller ("org.mpris.MediaPlayer2.rhythmbox");   
+    Mpris2Controller controller = new Mpris2Controller (RB_NAME);
     controller.player.Next();
     Timeout.add_seconds (2, () => {
       assert (controller.received_prop_updates_for_metadata_change.size == 1);
@@ -346,7 +348,7 @@
 
   internal static async void do_test_async_property_update_activate_playlist (MainLoop loop)
   {
-    var contr = new Mpris2Controller ("org.mpris.MediaPlayer2.rhythmbox");
+    Mpris2Controller contr = new Mpris2Controller (RB_NAME);
     try{
       PlaylistDetails[] pls = yield contr.playlists.GetPlaylists (0,
                                                                   10,