c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(tunnel): simplify psiphon implementation (#289)

Browse source 
Simplify interaction within the package by avoiding to have
a psiphon specific config. Use a Config instead.

Part of https://github.com/ooni/probe/issues/985.
This commit is contained in:
Simone Basso 2021-04-03 21:09:34 +02:00 • committed by GitHub
commit f739450370
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 88 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

54
internal/engine/tunnel/psiphon_test.go
View file

@ -15,7 +15,9 @@ func TestPsiphonFetchPsiphonConfigFailure(t *testing.T) {
sess := &mockable.Session{
MockableFetchPsiphonConfigErr: expected,
}
tunnel, err := psiphonStart(context.Background(), sess, psiphonConfig{})
tunnel, err := psiphonStart(context.Background(), &Config{
Session: sess,
})
if !errors.Is(err, expected) {
t.Fatal("not the error we expected")
}
@ -26,14 +28,14 @@ func TestPsiphonFetchPsiphonConfigFailure(t *testing.T) {
func TestPsiphonMakeMkdirAllFailure(t *testing.T) {
expected := errors.New("mocked error")
dependencies := psiphonFakeDependencies{
MkdirAllErr: expected,
}
sess := &mockable.Session{
MockableFetchPsiphonConfigResult: []byte(`{}`),
}
tunnel, err := psiphonStart(context.Background(), sess, psiphonConfig{
Dependencies: dependencies,
tunnel, err := psiphonStart(context.Background(), &Config{
Session: sess,
testMkdirAll: func(path string, perm os.FileMode) error {
return expected
},
})
if !errors.Is(err, expected) {
t.Fatal("not the error we expected")
@ -45,14 +47,14 @@ func TestPsiphonMakeMkdirAllFailure(t *testing.T) {
func TestPsiphonMakeRemoveAllFailure(t *testing.T) {
expected := errors.New("mocked error")
dependencies := psiphonFakeDependencies{
RemoveAllErr: expected,
}
sess := &mockable.Session{
MockableFetchPsiphonConfigResult: []byte(`{}`),
}
tunnel, err := psiphonStart(context.Background(), sess, psiphonConfig{
Dependencies: dependencies,
tunnel, err := psiphonStart(context.Background(), &Config{
Session: sess,
testRemoveAll: func(path string) error {
return expected
},
})
if !errors.Is(err, expected) {
t.Fatal("not the error we expected")
@ -64,14 +66,15 @@ func TestPsiphonMakeRemoveAllFailure(t *testing.T) {
func TestPsiphonMakeStartFailure(t *testing.T) {
expected := errors.New("mocked error")
dependencies := psiphonFakeDependencies{
StartErr: expected,
}
sess := &mockable.Session{
MockableFetchPsiphonConfigResult: []byte(`{}`),
}
tunnel, err := psiphonStart(context.Background(), sess, psiphonConfig{
Dependencies: dependencies,
tunnel, err := psiphonStart(context.Background(), &Config{
Session: sess,
testStartPsiphon: func(ctx context.Context, config []byte,
workdir string) (*clientlib.PsiphonTunnel, error) {
return nil, expected
},
})
if !errors.Is(err, expected) {
t.Fatal("not the error we expected")
@ -91,22 +94,3 @@ func TestPsiphonNilTunnel(t *testing.T) {
}
tunnel.Stop() // must not crash
}
type psiphonFakeDependencies struct {
MkdirAllErr error
RemoveAllErr error
StartErr error
}
func (fd psiphonFakeDependencies) MkdirAll(path string, perm os.FileMode) error {
return fd.MkdirAllErr
}
func (fd psiphonFakeDependencies) RemoveAll(path string) error {
return fd.RemoveAllErr
}
func (fd psiphonFakeDependencies) Start(
ctx context.Context, config []byte, workdir string) (*clientlib.PsiphonTunnel, error) {
return nil, fd.StartErr
}