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

[Brian Curtin]

- Update run-tests.bat to work with buildout changes to executable paths.

Update Windwos run-tests script to work with recent buildout changes

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-07-30 18:54:17 +0000
+++ run-tests.bat	2012-10-08 20:35:27 +0000
@@ -34,8 +34,8 @@
 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 %%B in (u1trial.exe) do (SET TRIALPATH=%%~$PATH:B)
+FOR %%C in (u1lint.exe) do (SET LINTPATH=%%~$PATH:C)
 FOR %%D in (pep8.exe) do (SET PEP8PATH=%%~$PATH:D)
 
 IF NOT "%PYTHONEXEPATH%" == "" GOTO :PYTHONPRESENT
@@ -74,13 +74,13 @@
 COPY windows\clientdefs.py ubuntuone\clientdefs.py
 COPY windows\logging.conf data\logging.conf
 :: execute the tests with a number of ignored linux and mac os only modules
-"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux -i "test_linux.py,test_darwin.py,test_fsevents_daemon.py" %PARAMS% tests
+"%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux -i "test_linux.py,test_darwin.py,test_fsevents_daemon.py" %PARAMS% tests
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks
     GOTO :CLEAN)
 ECHO Performing style checks...
-"%PYTHONEXEPATH%" "%LINTPATH%"
+"%LINTPATH%"
 
 "%PYTHONEXEPATH%" tests\platform\check_reactor_import.py