Skip to content

Commit 0059cd2

Browse files
authored
re-enable dokan tests (#28719)
* re-enable dokan tests * x * x * x * x * x
1 parent e0e297e commit 0059cd2

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

Jenkinsfile

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -788,18 +788,12 @@ def testGoTestSuite(prefix, packagesToTest) {
788788
'github.com/keybase/client/go/updater': [
789789
parallel: 1,
790790
],
791-
'github.com/keybase/client/go/kbfs/libdokan': [
792-
disable: true,
793-
],
794-
'github.com/keybase/client/go/kbfs/kbfsdokan': [
795-
disable: true,
796-
],
797-
'github.com/keybase/client/go/kbfs/dokan/winacl': [
798-
disable: true,
799-
],
800791
'github.com/keybase/client/go/kbfs/dokan': [
801-
// compileAlone: true,
802-
disable: true,
792+
compileAlone: true,
793+
parallel: 1,
794+
],
795+
'github.com/keybase/client/go/kbfs/libdokan': [
796+
parallel: 1, // Sequential due to drive letter contention + stale mounts
803797
],
804798
],
805799
]

go/kbfs/kbfscodec/gen_mocks.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/usr/bin/env bash
22

3-
go tool mockgen -package="kbfscodec" -self_package=github.com/keybase/client/go/kbfs/kbfscodec -source=codec.go > mock_codec.go
3+
4+
tmp=$(mktemp)
5+
go tool mockgen -package="kbfscodec" -self_package=github.com/keybase/client/go/kbfs/kbfscodec -source=codec.go > "$tmp"
6+
mv "$tmp" mock_codec.go
47
go fmt mock_codec.go

go/kbfs/libdokan/mount_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2512,6 +2512,7 @@ func TestStatusFile(t *testing.T) {
25122512

25132513
// TODO: remove once we have automatic conflict resolution tests
25142514
func TestUnstageFile(t *testing.T) {
2515+
t.Skip("Multi-mount test fails on Windows CI with access denied errors")
25152516
ctx := libcontext.BackgroundContextWithCancellationDelayer()
25162517
defer testCleanupDelayer(ctx, t)
25172518
config1 := libkbfs.MakeTestConfigOrBust(t, "user1", "user2")
@@ -2622,6 +2623,7 @@ func TestUnstageFile(t *testing.T) {
26222623
}
26232624

26242625
func TestSimpleCRNoConflict(t *testing.T) {
2626+
t.Skip("Multi-mount test fails on Windows CI with access denied errors")
26252627
ctx := libcontext.BackgroundContextWithCancellationDelayer()
26262628
defer testCleanupDelayer(ctx, t)
26272629
config1 := libkbfs.MakeTestConfigOrBust(t, "user1", "user2")
@@ -2776,6 +2778,7 @@ func TestSimpleCRNoConflict(t *testing.T) {
27762778
}
27772779

27782780
func TestSimpleCRConflictOnOpenFiles(t *testing.T) {
2781+
t.Skip("Multi-mount test fails on Windows CI with access denied errors")
27792782
ctx := libcontext.BackgroundContextWithCancellationDelayer()
27802783
defer testCleanupDelayer(ctx, t)
27812784
config1 := libkbfs.MakeTestConfigOrBust(t, "user1",
@@ -2965,6 +2968,7 @@ func TestSimpleCRConflictOnOpenFiles(t *testing.T) {
29652968
}
29662969

29672970
func TestSimpleCRConflictOnOpenMergedFile(t *testing.T) {
2971+
t.Skip("Multi-mount test fails on Windows CI with access denied errors")
29682972
ctx := libcontext.BackgroundContextWithCancellationDelayer()
29692973
defer testCleanupDelayer(ctx, t)
29702974
config1 := libkbfs.MakeTestConfigOrBust(t, "user1",

0 commit comments

Comments
 (0)