Merge lp:~dobey/dirspec/update-4-0 into lp:dirspec/stable-4-0

[dobey]

[Brian Curtin]

    Adjust run-tests.bat to work with the Windows buildout environment.

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/dirspec/update-4-0 into lp:dirspec/stable-4-0 failed. Below is the output from the failed tests.

running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/dirspec
copying dirspec/utils.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/basedir.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/__init__.py -> build/lib.linux-x86_64-2.7/dirspec
running test
running egg_info
creating dirspec.egg-info
writing dirspec.egg-info/PKG-INFO
writing top-level names to dirspec.egg-info/top_level.txt
writing dependency_links to dirspec.egg-info/dependency_links.txt
writing manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'dirspec.egg-info/SOURCES.txt'
running build_ext

+ python ./setup.py build test clean
test_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_cache_home ... ok
test_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_dirs ... ok
test_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_home ... ok
test_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_dirs ... ok
test_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_home ... ok
test_default_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_cache_home ... ok
test_default_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_dirs ... ok
test_default_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_home ... ok
test_default_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_dirs ... ok
test_default_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_home ... ok
test_load_config_paths_filter (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_load_config_paths_filter ... ok
test_save_config_path (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_save_config_path ... ok
test_xdg_cache_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_cache_home_is_utf8_bytes ... ok
test_xdg_config_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_dirs_are_bytes ... ok
test_xdg_config_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_home_is_utf8_bytes ... ok
test_xdg_data_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_data_dirs_are_bytes ... ok
...

[lp:~dobey/dirspec/update-4-0]

9. By Brian Curtin on 2012-07-30

[Brian Curtin]

    Adjust run-tests.bat to work with the Windows buildout environment.

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-07-13 18:55:53 +0000
+++ run-tests.bat	2012-07-30 18:24:18 +0000
@@ -12,35 +12,29 @@
 :: 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 PYTHONEXECPATH=""
-:: 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 PYTHONEXECPATH=%%A
-IF NOT %PYTHONEXECPATH% == "" 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 PYTHONEXECPATH=%%A
-IF NOT %PYTHONEXECPATH% == "" GOTO :PYTHONPRESENT
-:: we do not have python (2.6 or 2.7), therefore we go to end
+
+SET PYTHONEXEPATH=""
+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 %%C in (pyflakes) do (SET FLAKESPATH=%%~$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
 ECHO Python found, executing the tests...
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXECPATH%\python.exe" setup.py build test clean
-"%PYTHONEXECPATH%\python.exe" "%PYTHONEXECPATH%\Scripts\pyflakes" dirspec
+"%PYTHONEXEPATH%" setup.py build test clean
+"%PYTHONEXEPATH%" "%FLAKESPATH%" dirspec
 :: test for style if we can, if pep8 is not present, move to the end
-IF EXIST "%PYTHONEXECPATH%Scripts\pep8.exe"
-"%PYTHONEXECPATH%\Scripts\pep8.exe" --repeat dirspec
-ELSE
-ECHO Style checks were not done
+IF EXIST "%PEP8PATH%" (
+"%PEP8PATH%" --repeat dirspec
+)ELSE (
+ECHO Style checks were not done)
 :END