]>
Commit | Line | Data |
---|---|---|
08eb5322 AM |
1 | --- pyfakefs-3.4.1/pyfakefs/tests/fake_os_test.py.orig 2018-03-18 08:35:26.000000000 +0100 |
2 | +++ pyfakefs-3.4.1/pyfakefs/tests/fake_os_test.py 2018-05-19 21:06:12.791205352 +0200 | |
792227e6 JB |
3 | @@ -964,7 +964,7 @@ |
4 | ||
5 | def test_append_mode_tell_linux_windows(self): | |
6 | self.check_linux_and_windows() | |
7 | - tell_result = 5 if self.is_python2 else 7 | |
8 | + tell_result = 5 if (self.is_python2 and not self.use_real_fs()) else 7 | |
9 | self.check_append_mode_tell_after_truncate(tell_result) | |
10 | ||
11 | def test_append_mode_tell_macos(self): | |
12 | @@ -4113,6 +4113,8 @@ | |
13 | def test_path_links_not_resolved(self): | |
14 | # regression test for #350 | |
15 | self.skip_if_symlink_not_supported() | |
16 | + if not hasattr(self.os, 'scandir'): | |
17 | + raise unittest.SkipTest('os.scandir not found') | |
18 | dir_path = self.make_path('A', 'B', 'C') | |
19 | self.os.makedirs(self.os.path.join(dir_path, 'D')) | |
20 | link_path = self.make_path('A', 'C') | |
f1c59ea7 JB |
21 | --- pyfakefs-3.4.1/pyfakefs/fake_filesystem_unittest.py.orig 2018-03-18 08:35:26.000000000 +0100 |
22 | +++ pyfakefs-3.4.1/pyfakefs/fake_filesystem_unittest.py 2018-05-20 20:39:45.228782238 +0200 | |
23 | @@ -70,7 +70,7 @@ | |
24 | ||
25 | try: | |
26 | import scandir # noqa: F401 import used to set has_scandir | |
27 | - import fake_scandir | |
28 | + from pyfakefs import fake_scandir | |
29 | has_scandir = True | |
30 | except ImportError: | |
31 | has_scandir = False |