tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Fileutil improvements #265

Closed
meejah wants to merge 11 commits from fileutil-improvements into master
pull from: fileutil-improvements
merge into: tahoe-lafs:master
Conversation 6 Commits 11 Files Changed 2 +278 -4
meejah commented 2016-04-25 19:25:53 +00:00 (Migrated from github.com)
Copy Link

This pulls out (most of) the fileutil.py changes from 2438.magic-folder-stable.14

This pulls out (most of) the fileutil.py changes from 2438.magic-folder-stable.14
warner commented 2016-04-25 22:56:22 +00:00 (Migrated from github.com)
Copy Link

I don't pretend to understand the problem, but the new test failed on appveyor (windows).. could you take a look?

https://ci.appveyor.com/project/tahoe-lafs/tahoe-lafs/build/1.0.80#L1129

File "c:\projects\tahoe-lafs\src\allmydata\test\test_util.py", line 575, in test_make_dirs_with_absolute_mode
    new_mode = os.stat(os.path.join(workdir,"a/b/c/d")).st_mode & 0777
exceptions.WindowsError: [Error 123] The filename, directory name, or volume label syntax is incorrect: u'\\\\?\\C:\\projects\\tahoe-lafs\\_trial_temp\\test_make_dirs_with_absolute_mode\\a/b/c/d'

(all tests passed for me on unix)

I don't pretend to understand the problem, but the new test failed on appveyor (windows).. could you take a look? https://ci.appveyor.com/project/tahoe-lafs/tahoe-lafs/build/1.0.80#L1129 ``` File "c:\projects\tahoe-lafs\src\allmydata\test\test_util.py", line 575, in test_make_dirs_with_absolute_mode new_mode = os.stat(os.path.join(workdir,"a/b/c/d")).st_mode & 0777 exceptions.WindowsError: [Error 123] The filename, directory name, or volume label syntax is incorrect: u'\\\\?\\C:\\projects\\tahoe-lafs\\_trial_temp\\test_make_dirs_with_absolute_mode\\a/b/c/d' ``` (all tests passed for me on unix)
meejah commented 2016-04-25 23:28:28 +00:00 (Migrated from github.com)
Copy Link

hmm, presumably needs some other windows-fixes patch brought in. i will find it :)

hmm, presumably needs some other windows-fixes patch brought in. i will find it :)
coveralls commented 2016-05-04 03:06:08 +00:00 (Migrated from github.com)
Copy Link

Coverage Status

Coverage decreased (-0.1%) to 92.303% when pulling e16d712929 on meejah:fileutil-improvements into 9402b40da5 on tahoe-lafs:master.

[![Coverage Status](https://coveralls.io/builds/6040437/badge)](https://coveralls.io/builds/6040437) Coverage decreased (-0.1%) to 92.303% when pulling **e16d712929c45192d2978ba542087e49ff30e851 on meejah:fileutil-improvements** into **9402b40da568668d2de27643d11e3807c564bd71 on tahoe-lafs:master**.
meejah commented 2016-05-04 03:22:12 +00:00 (Migrated from github.com)
Copy Link

Hmmm. I didn't really change anything in the last push (just squashed two windows-fixup commits together to force a build). Perhaps similar to an intermittent problem @warner was seeing?

Hmmm. I didn't really change anything in the last push (just squashed two windows-fixup commits together to force a build). Perhaps similar to an intermittent problem @warner was seeing?
warner commented 2016-05-04 14:56:30 +00:00 (Migrated from github.com)
Copy Link

Eh, appveyor seems happy with the latest version, and that's good enough for me. I'll rebase to current master (some storage-broker stuff changed since then) and land it shortly. Thanks!

Eh, appveyor seems happy with the latest version, and that's good enough for me. I'll rebase to current master (some storage-broker stuff changed since then) and land it shortly. Thanks!
warner commented 2016-05-04 15:05:47 +00:00 (Migrated from github.com)
Copy Link

Landed (in rebased form) in c715e0d.

Landed (in rebased form) in c715e0d.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Benchmarking and Performance

   
HTTP Storage Protocol

   
Nevow Removal

   
Python 3 Porting

   
not-for-merge
No Label
Benchmarking and Performance
HTTP Storage Protocol
Nevow Removal
Python 3 Porting
not-for-merge
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: tahoe-lafs/tahoe-lafs#265
No description provided.
Delete Branch "fileutil-improvements"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?