Ubuntu Single Sign On Client

Merge lp:~mikemc/ubuntu-sso-client/no-darwin-in-linuxnwindows-tests into lp:ubuntu-sso-client

  1. no-darwin-in-linuxnwindows-tests
  2. Merge into trunk
Proposed by Mike McCracken on 2012-05-16
Status: Merged
Approved by: Alejandro J. Cura on 2012-05-23
Approved revision: 968
Merged at revision: 958
Proposed branch: lp:~mikemc/ubuntu-sso-client/no-darwin-in-linuxnwindows-tests
Merge into: lp:ubuntu-sso-client
Prerequisite: lp:~mandel/ubuntu-sso-client/use-unix-domain
Diff against target: 49 lines (+8/-4)
2 files modified
run-tests (+7/-3)
run-tests.bat (+1/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntu-sso-client/no-darwin-in-linuxnwindows-tests
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) 2012-05-16 Approve on 2012-05-23
Manuel de la Peña (community) 2012-05-16 Approve on 2012-05-17
Review via email: mp+105924@code.launchpad.net

Commit Message

- Fix test scripts for linux and windows to avoid running darwin tests

Description of the Change

- Fix test scripts for linux and windows to avoid running darwin tests

added test_darwin.py to ignore lists on run-tests and run-tests.bat

Tested on both linux and windows, as you might assume.

To post a comment you must log in.
lp:~mikemc/ubuntu-sso-client/no-darwin-in-linuxnwindows-tests updated on 2012-05-16
968. By Mike McCracken on 2012-05-16

refactor ignored test paths

Mike McCracken (mikemc) wrote :

Last commit uses env vars in the run-tests script as suggested by mandel on IRC.

Manuel de la Peña (mandel) :
review: Approve
Alejandro J. Cura (alecu) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run-tests'
2--- run-tests 2012-04-20 19:28:22 +0000
3+++ run-tests 2012-05-16 22:11:18 +0000
4@@ -28,9 +28,13 @@
5 # do not wish to do so, delete this exception statement from your
6 # version. If you delete this exception statement from all source
7 # files in the program, then also delete it here.
8+
9 QT_TESTS_PATH="ubuntu_sso/qt/tests, ubuntu_sso/qt/main/tests"
10+QT_TEST_FILES="test_qt.py,test_qtwisted.py"
11+
12 GTK_TESTS_PATH=ubuntu_sso/gtk/tests
13-WINDOWS_TESTS=test_windows.py
14+
15+LINUX_IGNORE_FILES="test_darwin.py,test_windows.py,test_pykeyring.py"
16
17 set -e
18
19@@ -59,7 +63,7 @@
20 fi
21
22 echo "*** Running GTK test suite for ""$MODULE"" ***"
23-$XVFB_CMDLINE u1trial --reactor=gi --gui -p "$QT_TESTS_PATH" -i "test_windows.py,test_qt.py,test_qtwisted.py,test_pykeyring.py" "$MODULE"
24+$XVFB_CMDLINE u1trial --reactor=gi --gui -p "$QT_TESTS_PATH" -i "$QT_TEST_FILES,$LINUX_IGNORE_FILES" "$MODULE"
25 rm -rf _trial_temp
26
27 # hack to avoid:
28@@ -69,7 +73,7 @@
29
30 echo "*** Running QT test suite for ""$MODULE"" ***"
31 ./setup.py build
32-$XVFB_CMDLINE u1trial --reactor=qt4 --gui -p "$GTK_TESTS_PATH" -i "test_windows.py" "$MODULE"
33+$XVFB_CMDLINE u1trial --reactor=qt4 --gui -p "$GTK_TESTS_PATH" -i $LINUX_IGNORE_FILES "$MODULE"
34 rm -rf _trial_temp
35 rm -rf build
36
37
38=== modified file 'run-tests.bat'
39--- run-tests.bat 2012-04-20 18:43:44 +0000
40+++ run-tests.bat 2012-05-16 22:11:18 +0000
41@@ -74,7 +74,7 @@
42 "%PYTHONEXEPATH%" setup.py build
43 ECHO Running tests
44 :: execute the tests with a number of ignored linux only modules
45-"%PYTHONEXEPATH%" "%TRIALPATH%" -i "test_linux.py, test_txsecrets.py, test_qt.py, test_glib.py" -p "ubuntu_sso\gtk" --reactor=qt4 --gui %PARAMS% ubuntu_sso
46+"%PYTHONEXEPATH%" "%TRIALPATH%" -i "test_darwin.py, test_linux.py, test_txsecrets.py, test_qt.py, test_glib.py" -p "ubuntu_sso\gtk" --reactor=qt4 --gui %PARAMS% ubuntu_sso
47 :: Clean the build from the setupt.py
48 ECHO Cleaning the generated code before running the style checks...
49 "%PYTHONEXEPATH%" setup.py clean

Subscribers

People subscribed via source and target branches