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

[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-client/run-tests-buildout-cleanup]

1226. By Brian Curtin on 2012-04-18

Prefer the TRIAL_TEMP_DIR environment variable for Jenkins, and fall back to the local _trial_temp directory

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Manuel de la Peña (mandel)]

Same here, worked with no problems!

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-09 20:07:05 +0000
+++ run-tests.bat	2012-04-18 17:33:51 +0000
@@ -27,58 +27,22 @@
 
 @ECHO off
 
-:: We could have Python 2.6 or 2.7 on Windows. In order to check availability,
-:: we should first check for 2.7, and run the tests, otherwise fall back to 2.6.
-SET REGQUERY27="REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve"
-SET REGQUERY2732="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.7\InstallPath /ve"
-SET REGQUERY26="REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve"
-SET REGQUERY2632="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.6\InstallPath /ve"
 SET PYTHONEXEPATH=""
 
-:: This is very annoying; FOR /F will work differently depending on the output
-:: of reg which is not consistent between OS versions (XP, 7). We must choose
-:: the tokens according to OS version.
-SET PYTHONPATHTOKENS=3
-VER | FIND "XP" > nul
-IF %ERRORLEVEL% == 0 (
-    SET PYTHONPATHTOKENS=4)
-
-ECHO Checking if python 2.7 is in the system
-
-:: Look for python 2.7
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY27%') DO @SET PYTHONEXEPATH=%%A
-
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
-
-ECHO Checking if python 2.6 is in the system
-:: we do not have python 2.7 in the system, try to find 2.6
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY26%') DO @SET PYTHONEXEPATH=%%A
-
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
-
-:: we do not have python (2.6 or 2.7) this could hapen in the case  that the
-:: user installed the 32version in a 64 machine, let check if the software was installed in the wow key
-
-:: Look for python 2.7 in WoW64
-ECHO Checking if python 2.7 32 is in the system
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2732%') DO @SET PYTHONEXEPATH=%%A
-
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
-
-ECHO Checking if python 2.6 32 is in the system
-:: we do not have python 2.7 in the system, try to find 2.6
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2632%') DO @SET PYTHONEXEPATH=%%A
-
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
+set PYTHONPATH=..\ubuntu-sso-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,
@@ -110,19 +74,28 @@
 COPY windows\clientdefs.py ubuntuone\clientdefs.py
 COPY windows\logging.conf data\logging.conf
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=twisted -c -p tests\platform\linux %PARAMS% tests
+"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux %PARAMS% tests
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks
     GOTO :CLEAN)
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint"
-:: test for style if we can, if pep8 is not present, move to the end
-IF EXIST "%PYTHONEXEPATH%\Scripts\pep8.exe" (
-    "%PYTHONEXEPATH%\Scripts\pep8.exe" --repeat ubuntuone
+ECHO Performing style checks...
+"%PYTHONEXEPATH%" "%LINTPATH%"
+
+:: if pep8 is not present, move to the end
+IF EXIST "%PEP8PATH%" (
+    "%PEP8PATH%" --repeat ubuntuone
 )ELSE (
     ECHO Style checks were not done)
 :CLEAN
+
+:: The dot must be escaped or the directory won't be found.
+IF EXIST \.coverage RMDIR /s /q \.coverage
+
 :: Delete the temp folders
-RMDIR /s /q _trial_temp
-RMDIR /s /q .coverage
+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%"
+
 :END