Merge lp:~brian.curtin/ubuntu-sso-client/run-tests-buildout-cleanup into lp:ubuntu-sso-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/ubuntu-sso-client/run-tests-buildout-cleanup]

945. By Manuel de la Peña on 2012-04-18

- Fixed all those broken tests on windows related to the dirty reactor left by twisted.pb (LP: #960436).

946. By Manuel de la Peña on 2012-04-18

- Added the use of the new added webserver that cleans resources correctly (LP: #960436).

947. By Manuel de la Peña on 2012-04-18

- Fixed tcp activation tests to clean resources correctly (LP: #960436).

[Diego Sarmentero (diegosarmentero)]

I think this is wrong:

You are removing:

-:: Copyright 2010-12 Canonical Ltd.

And adding:

+:: Author: Manuel de la Pena <email address hidden>
+::
+:: Copyright 2010 Canonical Ltd.

review: Needs Fixing

[lp:~brian.curtin/ubuntu-sso-client/run-tests-buildout-cleanup]

948. By Brian Curtin on 2012-04-20

fix copyright header

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

8 -::
9 -:: In addition, as a special exception, the copyright holders give
10 -:: permission to link the code of portions of this program with the
11 -:: OpenSSL library under certain conditions as described in each
12 -:: individual source file, and distribute linked combinations
13 -:: including the two.
14 -:: You must obey the GNU General Public License in all respects
15 -:: for all of the code used other than OpenSSL. If you modify
16 -:: file(s) with this exception, you may extend this exception to your
17 -:: version of the file(s), but you are not obligated to do so. If you
18 -:: do not wish to do so, delete this exception statement from your
19 -:: version. If you delete this exception statement from all source
20 -:: files in the program, then also delete it here.

You can't remove that. It's part of the license header. :)

review: Needs Fixing

[lp:~brian.curtin/ubuntu-sso-client/run-tests-buildout-cleanup]

949. By Brian Curtin on 2012-04-20

put the header back to how it was, again

[dobey (dobey)]

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-09 17:38:24 +0000
+++ run-tests.bat	2012-04-20 17:11:21 +0000
@@ -27,60 +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=.
+
+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
 :: is the first parameter and copy all the rest in a loop
@@ -106,16 +68,16 @@
 GOTO GETREST
 :CONTINUEBATCH
 
-ECHO Python found, building auto-generated modules...
+ECHO Python found at %PYTHONEXEPATH%, building auto-generated modules...
 :: call setup.py build so that the qt uic is called
 ::START "Build code" /D%CD% /WAIT "%PYTHONEXEPATH%\python.exe" setup.py build
-"%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" -i "test_linux.py, test_txsecrets.py, test_qt.py, test_glib.py" -p "ubuntu_sso\gtk" --reactor=qt4 --gui %PARAMS% ubuntu_sso 
+"%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
 :: Clean the build from the setupt.py
-ECHO Cleaning the generated code
-"%PYTHONEXEPATH%\python.exe" setup.py clean
+ECHO Cleaning the generated code before running the style checks...
+"%PYTHONEXEPATH%" setup.py clean
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks
@@ -123,11 +85,17 @@
 
 ECHO Performing style checks...
 SET IGNORE_LINT="ubuntu_sso\gtk,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"
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" -i "%IGNORE_LINT%" ubuntu_sso
+"%PYTHONEXEPATH%" "%LINTPATH%" -i "%IGNORE_LINT%" ubuntu_sso
 :: test for style if we can, if pep8 is not present, move to the end
-"%PYTHONEXEPATH%\Scripts\pep8.exe" --repeat .
+ECHO Running PEP-8 Check...
+"%PEP8PATH%" --repeat .
 :CLEAN
+
+IF EXIST \.coverage RMDIR /s /q \.coverage
 :: Delete the temp folders
-RMDIR /q /s _trial_temp
-DEL /q .coverage
+IF "%TRIAL_TEMP_DIR%" == "" GOTO :TRIALTEMPEXISTS
+IF EXIST _trial_temp RMDIR /s /s _trial_temp
+:TRIALTEMPEXISTS
+IF EXIST "%TRIAL_TEMP_DIR%" RMDIR /s /s "%TRIAL_TEMP_DIR%"
+
 :END