Merge lp:~mandel/ubuntuone-dev-tools/add_tests_batch into lp:ubuntuone-dev-tools

[Manuel de la Peña]

Added a .bat that will find the path where python is installed and will ran the tests so that lp:692494 is fixed.

Added a .bat that will find the path where python is installed and will ran the tests so that lp:692494 is fixed.

[dobey (dobey)]

22 +:: We coudl have python 2.6 or 2.7 on windows, to in order to find which one we
23 +:: have, we will first try to get the path to 2.6, if found we will move to
24 +:: execute the tests, otherwhise we try to find 2.7 and move on
25 +SET PYTHONPATH=""
26 +:: This is very anoying, FOR /F will work differently depending on the output
27 +:: of reg which is not consistent between os (xp, 7) we have to choose the tokens
28 +:: according to the os

Spelling and grammar errors abound.

:: 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.

:: 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.

Also, as per the first comment, you should change the Python checks to look for 2.7 first, and then fall back to 2.6.

review: Needs Fixing

[Roberto Alsina (ralsina)]

Works.

review: Approve

[lp:~mandel/ubuntuone-dev-tools/add_tests_batch]

16. By Manuel de la Peña on 2010-12-20

Fixed typo. Check for 2.7 before than 2.6

[dobey (dobey)]

The comments I mentioned previously still have some errors. It looks like you only fixed a couple of spelling errors, and not the grammar or other issues in the comments. The ones I suggested are much better to use there, as they more clearly describe what's going on.

[lp:~mandel/ubuntuone-dev-tools/add_tests_batch]

17. By Manuel de la Peña on 2010-12-20

Use sensible comments.

[dobey (dobey)]

review: Approve

[dobey (dobey)]

Actually, let's just rename the file to run-tests.bat instead. There's no need for the -windows, as the .bat pretty much indicates that much; and it will keep consistency with other platforms.

review: Needs Fixing

[lp:~mandel/ubuntuone-dev-tools/add_tests_batch]

18. By Manuel de la Peña on 2010-12-20

Renaming script to be consistent with the linux naming currently used.

[dobey (dobey)]

review: Approve

=== added file 'run-tests.bat'
--- run-tests.bat	1970-01-01 00:00:00 +0000
+++ run-tests.bat	2010-12-20 16:18:10 +0000
@@ -0,0 +1,52 @@
+:: Author: Manuel de la Pena <[e-mail]>
+::
+:: Copyright 2010 Canonical Ltd.
+::
+:: This program is free software: you can redistribute it and/or modify it
+:: under the terms of the GNU General Public License version 3, as published
+:: by the Free Software Foundation.
+::
+:: This program is distributed in the hope that it will be useful, but
+:: WITHOUT ANY WARRANTY; without even the implied warranties of
+:: MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+:: PURPOSE.  See the GNU General Public License for more details.
+::
+:: You should have received a copy of the GNU General Public License along
+:: with this program.  If not, see <http://www.gnu.org/licenses/>.
+@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 PYTHONPATH=""
+:: 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 ('REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve') DO @SET PYTHONPATH=%%A
+IF NOT %PYTHONPATH% == "" 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 ('REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve') DO @SET PYTHONPATH=%%A
+IF NOT %PYTHONPATH% == "" GOTO :PYTHONPRESENT
+:: we do not have python (2.6 or 2.7), therefore we go to end
+ECHO Please ensure you have python installed
+GOTO :END
+
+
+:PYTHONPRESENT
+ECHO Python found, executing the tests...
+:: execute the tests with a number of ignored linux only modules
+"%PYTHONPATH%\python.exe" bin/u1trial -c ubuntuone
+"%PYTHONPATH%\python.exe" bin/u1lint
+:: test for style if we can, if pep8 is not present, move to the end
+IF EXIST "%PYTHONPATH%Scripts\pep8.exe"
+START "Pep8" /B "%PYTHONPATH%\Scripts\pep8.exe" --repeat
+ELSE
+ECHO Style checks were not done
+:: Delete the temp folders
+RMDIR /s /q _trial_temp
+RMDIR /s /q .coverage
+:END
\ No newline at end of file