Re: svn commit: r1492044 - in /subversion/branches/1.8.x: ./ STATUS win-tests.py
Kinda wish we hadn't merged this into 1.8.x. Unless we revert this
means there will be changes to the 1.8.0 tarball from rc3. I'm fine
with that, but I'm not sure I would have done it for just this change
since it increases the testing that has to be done (at least one
Windows) for the final 1.8.0 files.
So far this is the only change from rc3 to 1.8.0 final.
On Wed, Jun 12, 2013 at 6:00 AM, svn-r...@apache.org wrote:
Author: svn-role
Date: Wed Jun 12 04:00:30 2013
New Revision: 1492044
URL: http://svn.apache.org/r1492044
Log:
Merge r1490679 from trunk:
* r1490679
Allow test suite to run properly on Windows.
Justification:
Fixes a (very) minor test setup failure when running the ra_serf tests on
Windows for the first time in a given environment.
Votes:
+1: pburba, rhuijben, ivan
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/win-tests.py
Propchange: subversion/branches/1.8.x/
--
Merged /subversion/trunk:r1490679
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1492044r1=1492043r2=1492044view=diff
==
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 12 04:00:30 2013
@@ -138,14 +138,6 @@ Approved for 1.8.1 or if soak is restart
Approved changes:
=
- * r1490679
- Allow test suite to run properly on Windows.
- Justification:
- Fixes a (very) minor test setup failure when running the ra_serf tests
on
- Windows for the first time in a given environment.
- Votes:
- +1: pburba, rhuijben, ivan
-
# 1.8.0-rc3 is being voted on currently and as such 1.8.0 is in the soak
phase.
# Changes that are not intended for 1.8.0 should not be placed here and
changes
# that would restart the soak should not be added unless they are resolving
Modified: subversion/branches/1.8.x/win-tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/win-tests.py?rev=1492044r1=1492043r2=1492044view=diff
==
--- subversion/branches/1.8.x/win-tests.py (original)
+++ subversion/branches/1.8.x/win-tests.py Wed Jun 12 04:00:30 2013
@@ -600,6 +600,12 @@ class Httpd:
def _create_dontdothat_file(self):
Create empty mime.types file
+# If the tests have not previously been run or were cleaned
+# up, then 'svn-test-work' does not exist yet.
+parent_dir = os.path.dirname(self.dontdothat_file)
+if not os.path.exists(parent_dir):
+ os.makedirs(parent_dir)
+
fp = open(self.dontdothat_file, 'w')
fp.write('[recursive-actions]\n')
fp.write('/ = deny\n')
Re: svn commit: r1492044 - in /subversion/branches/1.8.x: ./ STATUS win-tests.py
On Wed, Jun 12, 2013 at 1:57 PM, Ben Reser b...@reser.org wrote: Kinda wish we hadn't merged this into 1.8.x. Unless we revert this means there will be changes to the 1.8.0 tarball from rc3. I'm fine with that, but I'm not sure I would have done it for just this change since it increases the testing that has to be done (at least one Windows) for the final 1.8.0 files. So far this is the only change from rc3 to 1.8.0 final. I moved this revision to the approved section, but I was thinking that we disabled automatic svn-role backporting. Anyway I think this revision should be in 1.8.0: otherwise test suite cannot be started without manual tweaks. -- Ivan Zhakov CTO | VisualSVN | http://www.visualsvn.com
Re: svn commit: r1492044 - in /subversion/branches/1.8.x: ./ STATUS win-tests.py
On Wed, Jun 12, 2013 at 3:26 PM, Branko Čibej br...@wandisco.com wrote: Messing with a release candidate for the sake of a couple minor test suite tweaks is not my idea of sane release management. In other words, -1 to putting this in 1.8.0. Instead, I propose we revert that change and explain how to run Windows tests in the release notes. We can then reintroduce the change in 1.8.1; it's not as if the test suite scripts have anything to do with binary compatibility. Daniel pointed out on IRC that we could just cut the release from the same magic rev. I'll do that unless there's a reason to make other changes. If there is then I'll have to revert the change.
Re: svn commit: r1492044 - in /subversion/branches/1.8.x: ./ STATUS win-tests.py
Ben Reser wrote on Wed, Jun 12, 2013 at 15:32:58 +0200: On Wed, Jun 12, 2013 at 3:26 PM, Branko Čibej br...@wandisco.com wrote: Messing with a release candidate for the sake of a couple minor test suite tweaks is not my idea of sane release management. In other words, -1 to putting this in 1.8.0. Instead, I propose we revert that change and explain how to run Windows tests in the release notes. We can then reintroduce the change in 1.8.1; it's not as if the test suite scripts have anything to do with binary compatibility. Daniel pointed out on IRC that we could just cut the release from the same magic rev. I'll do that unless there's a reason to make other changes. If there is then I'll have to revert the change. Note that if you revert it, the mergebot will just merge it _again_ the following night (your time), unless you also move the entry out of the (second) Approved section.
Re: svn commit: r1492044 - in /subversion/branches/1.8.x: ./ STATUS win-tests.py
On Wed, Jun 12, 2013 at 3:35 PM, Daniel Shahaf danie...@elego.de wrote: Note that if you revert it, the mergebot will just merge it _again_ the following night (your time), unless you also move the entry out of the (second) Approved section. Thanks for the reminder.
