Merge lp:~mandel/ubuntuone-dev-tools/fix-squid-tests into lp:ubuntuone-dev-tools
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Manuel de la Peña | ||||||||||||||||
Approved revision: | 76 | ||||||||||||||||
Merged at revision: | 70 | ||||||||||||||||
Proposed branch: | lp:~mandel/ubuntuone-dev-tools/fix-squid-tests | ||||||||||||||||
Merge into: | lp:ubuntuone-dev-tools | ||||||||||||||||
Diff against target: |
509 lines (+266/-33) 9 files modified
data/squid.conf.in (+5/-5) run-tests (+2/-2) run-tests.bat (+3/-1) setup.py (+17/-9) ubuntuone/devtools/services/squid.py (+54/-9) ubuntuone/devtools/services/tests/test_squid.py (+9/-6) ubuntuone/devtools/services/tests/test_squid_linux.py (+67/-0) ubuntuone/devtools/services/tests/test_squid_windows.py (+108/-0) ubuntuone/devtools/testcases/tests/test_squid_testcase.py (+1/-1) |
||||||||||||||||
To merge this branch: | bzr merge lp:~mandel/ubuntuone-dev-tools/fix-squid-tests | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email: mp+103325@code.launchpad.net |
Commit message
Description of the change
- Ensured that the ncsa_auth.exe can be found on windows (LP: #987213).
- Formatted the path correctly so that the squid config can read them (LP: #987225).
- Use win32api to kill the squid process (LP: #987256)
- Use dirspec to place the data files correctly on windows (LP: #988228).
In order to tests the branch you have to follow these steps:
1- Download and copy to C:\squid the windows squid binaries from here: http://
2- Downlaod the apacache msi and install it: http://
3- Ensure the following is in your path: C:\squid\
All the above will allow you to run the proxy tests on windows.
Note: The path to the apache bins might differ depending on your system.
98 +if sys.platform == 'win32': devtools. services. squid import windows devtools. services. squid import linux
99 + from ubuntuone.
100 + source = windows
101 +else:
102 + from ubuntuone.
103 + source = linux
why not import windows as source, and import linux as source?