Merge lp:~brian.curtin/ubuntuone-control-panel/run-tests-buildout-cleanup into lp:ubuntuone-control-panel

[Brian Curtin]

- Make run-tests.bat work with the new buildout environment.

Allow run-tests.bat to work with the new buildout environment.

This depends on lp:~brian.curtin/ubuntuone-windows-installer/buildout-env

[lp:~brian.curtin/ubuntuone-control-panel/run-tests-buildout-cleanup]

314. By Brian Curtin on 2012-04-18

Prefer TRIAL_TEMP_DIR

315. By Brian Curtin on 2012-04-18

Whoops, add TRIALTEMPEXISTS

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-02-29 19:49:44 +0000
+++ run-tests.bat	2012-04-18 17:55:14 +0000
@@ -17,9 +17,23 @@
 @ECHO off
 
 SET MODULE="ubuntuone"
-SET PYTHONEXEPATH="C:\Python27"
+SET PYTHONEXEPATH=""
 SET IGNORE_PATHS="ubuntuone\controlpanel\dbustests"
 SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
+SET PYTHONPATH=..\ubuntu-sso-client;..\ubuntuone-client;.
+
+ECHO Checking for Python on the path
+:: Look for Python from buildout
+FOR %%A in (python.exe) do (SET PYTHONEXEPATH=%%~$PATH:A)
+FOR %%B in (u1trial) do (SET TRIALPATH=%%~$PATH:B)
+FOR %%C in (u1lint) do (SET LINTPATH=%%~$PATH:C)
+FOR %%D in (pep8.exe) do (SET PEP8PATH=%%~$PATH:D)
+
+IF NOT "%PYTHONEXEPATH%" == "" GOTO :PYTHONPRESENT
+ECHO Please ensure you have python installed
+GOTO :END
+
+:PYTHONPRESENT
 
 :: throw the first parameter away if is /skip-lint,
 :: the way we do this is to ensure that /skip-lint
@@ -47,18 +61,21 @@
 :CONTINUEBATCH
 
 
-"%PYTHONEXEPATH%\python.exe" setup.py build
+"%PYTHONEXEPATH%" setup.py build
 ECHO Running tests
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %PARAMS% %MODULE%
+"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %PARAMS% %MODULE%
 :: Clean the build from the setupt.py
 ECHO Cleaning the generated code
-"%PYTHONEXEPATH%\python.exe" setup.py clean
+"%PYTHONEXEPATH%" setup.py clean
 
 IF %SKIPLINT% == 1 GOTO :CLEAN
 ECHO Performing style checks...
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
-"%PYTHONEXEPATH%\Scripts\pep8.exe" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
+"%PYTHONEXEPATH%" "%LINTPATH%" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
+"%PEP8PATH%" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
 :CLEAN
 :: Delete the temp folders
-RMDIR /s /q _trial_temp
+IF "%TRIAL_TEMP_DIR%" == "" GOTO :TRIALTEMPEXISTS
+IF EXIST _trial_temp RMDIR /s /q _trial_temp
+:TRIALTEMPEXISTS
+IF EXIST "%TRIAL_TEMP_DIR%" RMDIR /s /q "%TRIAL_TEMP_DIR%"