Ubuntu Single Sign On Client

Merge lp:~brian.curtin/ubuntu-sso-client/run-tests-update into lp:ubuntu-sso-client

  1. run-tests-update
  2. Merge into trunk
Proposed by Brian Curtin on 2012-10-04
Status: Merged
Approved by: dobey on 2012-10-05
Approved revision: 1005
Merged at revision: 1005
Proposed branch: lp:~brian.curtin/ubuntu-sso-client/run-tests-update
Merge into: lp:ubuntu-sso-client
Diff against target: 43 lines (+6/-6)
1 file modified
run-tests.bat (+6/-6)
To merge this branch: bzr merge lp:~brian.curtin/ubuntu-sso-client/run-tests-update
Reviewer Review Type Date Requested Status
dobey (community) 2012-10-04 Approve on 2012-10-05
Review via email: mp+128098@code.launchpad.net

Commit Message

- u1lint and u1trial are now used as executables, and remove a duplicate /s changing it to the proper /q

Description of the Change

Small changes to bring Windows builds up to working with recent buildout changes.

To post a comment you must log in.
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run-tests.bat'
2--- run-tests.bat 2012-06-27 19:03:44 +0000
3+++ run-tests.bat 2012-10-04 19:40:30 +0000
4@@ -34,8 +34,8 @@
5 ECHO Checking for Python on the path
6 :: Look for Python from buildout
7 FOR %%A in (python.exe) do (SET PYTHONEXEPATH=%%~$PATH:A)
8-FOR %%B in (u1trial) do (SET TRIALPATH=%%~$PATH:B)
9-FOR %%C in (u1lint) do (SET LINTPATH=%%~$PATH:C)
10+FOR %%B in (u1trial.exe) do (SET TRIALPATH=%%~$PATH:B)
11+FOR %%C in (u1lint.exe) do (SET LINTPATH=%%~$PATH:C)
12 FOR %%D in (pep8.exe) do (SET PEP8PATH=%%~$PATH:D)
13
14 IF NOT "%PYTHONEXEPATH%" == "" GOTO :PYTHONPRESENT
15@@ -74,7 +74,7 @@
16 "%PYTHONEXEPATH%" setup.py build
17 ECHO Running tests
18 :: execute the tests with a number of ignored linux only modules
19-"%PYTHONEXEPATH%" "%TRIALPATH%" -i "test_darwin.py, test_linux.py, test_txsecrets.py, test_qt.py, test_glib.py" --reactor=qt4 --gui %PARAMS% ubuntu_sso
20+"%TRIALPATH%" -i "test_darwin.py, test_linux.py, test_txsecrets.py, test_qt.py, test_glib.py" --reactor=qt4 --gui %PARAMS% ubuntu_sso
21 :: Clean the build from the setupt.py
22 ECHO Cleaning the generated code before running the style checks...
23 "%PYTHONEXEPATH%" setup.py clean
24@@ -85,7 +85,7 @@
25
26 ECHO Performing style checks...
27 SET IGNORE_LINT="ubuntu_sso\networkstate\linux.py,ubuntu_sso\main\linux.py,ubuntu_sso\main\tests\test_linux.py,ubuntu_sso\utils\txsecrets.py,ubuntu_sso\utils\tests\test_txsecrets.py,ubuntu_sso\tests\bin,bin\ubuntu-sso-login"
28-"%PYTHONEXEPATH%" "%LINTPATH%" -i "%IGNORE_LINT%" ubuntu_sso
29+"%LINTPATH%" -i "%IGNORE_LINT%" ubuntu_sso
30 :: test for style if we can, if pep8 is not present, move to the end
31 ECHO Running PEP-8 Check...
32 "%PEP8PATH%" --repeat .
33@@ -94,8 +94,8 @@
34 IF EXIST \.coverage RMDIR /s /q \.coverage
35 :: Delete the temp folders
36 IF "%TRIAL_TEMP_DIR%" == "" GOTO :TRIALTEMPEXISTS
37-IF EXIST _trial_temp RMDIR /s /s _trial_temp
38+IF EXIST _trial_temp RMDIR /s /q _trial_temp
39 :TRIALTEMPEXISTS
40-IF EXIST "%TRIAL_TEMP_DIR%" RMDIR /s /s "%TRIAL_TEMP_DIR%"
41+IF EXIST "%TRIAL_TEMP_DIR%" RMDIR /s /q "%TRIAL_TEMP_DIR%"
42
43 :END

Subscribers

People subscribed via source and target branches