Merge lp:~brian.curtin/dirspec/windows-buildout into lp:dirspec

[Brian Curtin]

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

Update run-tests.bat to work with our buildout environments.

[dobey (dobey)]

+FOR %%B in (u1trial) do (SET TRIALPATH=%%~$PATH:B)

We are not using u1trial in dirspec, nor have we ever been (as it would introduce a circular dep, and now a dep on twisted which doesn't work with python3). This line should be removed.

review: Needs Fixing

[lp:~brian.curtin/dirspec/windows-buildout]

12. By Brian Curtin on 2012-07-17

c&p error, trial isn't used here

[Brian Curtin (brian.curtin)]

Fixed. That was a block pasted in from the other run-tests.bat files.

windowsbatchlint would have caught that

[dobey (dobey)]

review: Approve

[Mike McCracken (mikemc)]

Just left as a comment because I'm about to leave for a few days, but I can't run the tests with the buildout python - I think I must be missing a dependency somewhere?

C:\Users\mmccrack\Canonical\ubuntuone-windows-installer\scripts\devsetup\parts\dirspec>python setup.py test
running test
running 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
reading manifest file 'dirspec.egg-info\SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'dirspec.egg-info\SOURCES.txt'
running build_ext
Traceback (most recent call last):
  File "C:\Users\mmccrack\Canonical\ubuntuone-windows-installer\scripts\devsetup\bin\python-script.py", line 58, in <module>
    execfile(__file__)
  File "setup.py", line 26, in <module>
    test_suite='dirspec.tests',
  File "C:\Python27\lib\distutils\core.py", line 152, in setup
    dist.run_commands()
  File "C:\Python27\lib\distutils\dist.py", line 953, in run_commands
    self.run_command(cmd)
  File "C:\Python27\lib\distutils\dist.py", line 972, in run_command
    cmd_obj.run()
  File "C:\Python27\lib\site-packages\distribute-0.6.27-py2.7.egg\setuptools\command\test.py", line 137, in run
    self.with_project_on_sys_path(self.run_tests)
  File "C:\Python27\lib\site-packages\distribute-0.6.27-py2.7.egg\setuptools\command\test.py", line 117, in with_project_on_sys_path
    func()
  File "C:\Python27\lib\site-packages\distribute-0.6.27-py2.7.egg\setuptools\command\test.py", line 146, in run_tests
    testLoader = loader_class()
  File "C:\Python27\lib\unittest\main.py", line 94, in __init__
    self.parseArgs(argv)
  File "C:\Python27\lib\unittest\main.py", line 149, in parseArgs
    self.createTests()
  File "C:\Python27\lib\unittest\main.py", line 158, in createTests
    self.module)
  File "C:\Python27\lib\unittest\loader.py", line 128, in loadTestsFromNames
    suites = [self.loadTestsFromName(name, module) for name in names]
  File "C:\Python27\lib\unittest\loader.py", line 100, in loadTestsFromName
    parent, obj = obj, getattr(obj, part)
AttributeError: 'module' object has no attribute 'tests'

[Brian Curtin (brian.curtin)]

Ah yes, you need testtools installed. That's a part of a previous change to dirspec that Rodney made. If you manually add it to your buildout it'll work. I'll get it added to the buildout.cfg in bzr.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-07-13 18:55:53 +0000
+++ run-tests.bat	2012-07-17 20:59:23 +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