Skip to content

Commit 8cb63cc

Browse files
darstahldarstahl
committed
Use final version of continuity changes
Signed-off-by: Darren Stahl <[email protected]>
1 parent b36adf2 commit 8cb63cc

19 files changed

Lines changed: 268 additions & 1040 deletions

‎snapshots/testsuite/testsuite.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,16 @@ func checkSnapshotterBasic(ctx context.Context, t *testing.T, snapshotter snapsh
124124
fstest.Base(),
125125
)
126126

127+
if runtime.GOOS == "windows" {
128+
initialApplier = fstest.Apply(
129+
initialApplier,
130+
// Workaround for a Windows RS1 bug: Create a file inside /a/b/c
131+
// in order to initialize the empty folder in the filesystem filter
132+
fstest.CreateFile("/a/b/c/foo", []byte("bar\n"), 0777),
133+
)
134+
}
135+
127136
diffApplier := fstest.Apply(
128-
// Workaround for a Windows RS1 bug: Create a file inside /a/b/c
129-
// in order to initialize the empty folder in the filesystem filter
130-
fstest.CreateFile("/a/b/c/foo", []byte("bar\n"), 0777),
131137
fstest.CreateFile("/bar", []byte("bar\n"), 0777),
132138
// also, change content of foo to bar
133139
fstest.CreateFile("/foo", []byte("bar\n"), 0777),

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
44
github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
55
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
66
github.com/containerd/btrfs 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244
7-
github.com/containerd/continuity 3e8f2ea4b190484acb976a5b378d373429639a1a
7+
github.com/containerd/continuity ResolveRoot https://github.com/darrenstahlmsft/continuity.git
88
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6
99
github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
1010
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9

‎vendor/github.com/containerd/continuity/context.go‎

Lines changed: 13 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/driver/driver.go‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/driver/driver_unix.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/driver/driver_windows.go‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/fs/copy.go‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/fs/fstest/file_windows.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/syscallx/syscall_unix.go‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/syscallx/syscall_windows.go‎

Lines changed: 96 additions & 96 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)