Merge lp:~mikemc/ubuntuone-control-panel/fix-1010211-run-tests-on-darwin into lp:ubuntuone-control-panel

[Mike McCracken]

- add support for tests on darwin, warn about missing xvfb instead of quiet exit ( LP #1010211 )

- add support for tests on darwin, warn about missing xvfb instead of quiet exit ( LP #1010211 )

Tested on linux, doesn't break anything there.
Also tested on darwin. Works but some tests fail. Not this script's fault!

[dobey (dobey)]

Looks OK to me. Would like to get rid of all the excessive bits in the future (python $u1lint vs just using u1lint, etc type stuff).

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Diego Sarmentero (diegosarmentero)]

[ERROR]
Traceback (most recent call last):
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/tests/test_main.py", line 165, in test_all_styles_load
    main.main([sys.argv[0]])
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/__init__.py", line 89, in main
    source.main(app)
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/linux.py", line 22, in main
    from dbus.mainloop.qt import DBusQtMainLoop
exceptions.ImportError: No module named dbus.mainloop.qt

ubuntuone.controlpanel.gui.qt.main.tests.test_main.MainTestCase.test_all_styles_load
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/tests/test_main.py", line 179, in test_installer_option
    main.main([sys.argv[0], "--installer"])
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/__init__.py", line 89, in main
    source.main(app)
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/linux.py", line 22, in main
    from dbus.mainloop.qt import DBusQtMainLoop
exceptions.ImportError: No module named dbus.mainloop.qt

ubuntuone.controlpanel.gui.qt.main.tests.test_main.MainTestCase.test_installer_option
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/tests/test_main.py", line 153, in test_minimized_option
    main.main([sys.argv[0], "--minimized"])
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/__init__.py", line 89, in main
    source.main(app)
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/linux.py", line 22, in main
    from dbus.mainloop.qt import DBusQtMainLoop
exceptions.ImportError: No module named dbus.mainloop.qt

ubuntuone.controlpanel.gui.qt.main.tests.test_main.MainTestCase.test_minimized_option
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/tests/test_main.py", line 185, in test_minimized_with_icon_options
    main.main([sys.argv[0], "--minimized", "--with-icon"])
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/__init__.py", line 89, in main
    source.main(app)
  File "/Users/gatox/canonical/ubuntuone-control-panel-mmcc/ubuntuone/controlpanel/gui/qt/main/linux.py", line 22, in main
    from dbus.mainloop.qt import DBusQtMainLoop
exceptions.ImportError: No module named dbus.mainloop.qt

ubuntuone.controlpanel.gui.qt.main.tests.test_main.MainTestCase.test_minimized_with_icon_options
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/Users/ga...

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'run-tests'
--- run-tests	2012-04-25 13:35:35 +0000
+++ run-tests	2012-06-07 23:06:17 +0000
@@ -19,8 +19,9 @@
 QT_TESTS_PATH="ubuntuone/controlpanel/gui/qt/tests, ubuntuone/controlpanel/gui/qt/main/tests, ubuntuone/controlpanel/gui/qt/uniqueapp/tests"
 DBUS_TESTS_PATH=ubuntuone/controlpanel/dbustests
 WINDOWS_TESTS=test_windows.py
+LINUX_TESTS=test_linux.py
+DARWIN_TESTS=test_darwin.py
 
-set -e
 
 if [ $# -ne 0 ]; then
     # run specific module given by the caller
@@ -31,7 +32,7 @@
 fi
 
 style_check() {
-    u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
+    $u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
     if [ -x `which pep8` ]; then
         pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*
     else
@@ -45,15 +46,39 @@
     XVFB_CMDLINE="$XVFB -a"
 fi
 
+# now fail on errors, after we tried to find xvfb:
+set -e
+
+SYSNAME=`uname -s`
+
+if [ "$SYSNAME" == "Darwin" ]; then
+    u1trial="python $u1trial"
+    u1lint="python $u1lint"
+    IGNORE_FILES="$WINDOWS_TESTS, $LINUX_TESTS"
+    IGNORE_DBUS="-p $DBUS_TESTS_PATH"
+    echo "*** Skipping DBus test suite ***"
+    REACTOR=qt4
+    PYTHONPATH=$PYTHONPATH:../ubuntu-sso-client:../ubuntuone-client:../ubuntuone-storage-protocol:.
+else
+    # Linux:
+    if [ "x$XVFB_CMDLINE" == "x" ]; then
+	echo "WARNING: Could not find xvfb-run, prepare for visual spam."
+    fi
+    u1trial=u1trial
+    u1lint=u1lint
+    IGNORE_FILES="$WINDOWS_TESTS, $DARWIN_TESTS"
+    IGNORE_DBUS=""
+    echo "*** Running DBus test suite ***"
+    $u1trial --reactor=glib "$DBUS_TESTS_PATH"
+    REACTOR=gi
+fi
+
 echo "*** Running test suite for ""$MODULE"" ***"
-u1trial --reactor=gi -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$WINDOWS_TESTS" "$MODULE"
-
-echo "*** Running DBus test suite ***"
-u1trial --reactor=glib "$DBUS_TESTS_PATH"
+$u1trial --reactor=$REACTOR -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$IGNORE_FILES" "$MODULE"
 
 echo "*** Running QT test suite for ""$MODULE"" ***"
 ./setup.py build
-$XVFB_CMDLINE u1trial -i "$WINDOWS_TESTS" --reactor=qt4 --gui "$MODULE"
+$XVFB_CMDLINE $u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
 rm -rf _trial_temp
 rm -rf build