daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: all: update go and backend tools

Browse Source 
Updates #2275.

Squashed commit of the following:

commit f24c26cd2b49fac00a581936da4ccb13ca341bc9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 21:33:15 2021 +0300

    aghtest: imp docs

commit 46f5b06f9743e800b489e8c30af07d24bfdcf989
Merge: bfb852cb 55d4c7ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 21:32:32 2021 +0300

    Merge branch 'master' into 2275-upd

commit bfb852cbc74ec219a41e985f2dcb090d58299aee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 19:06:32 2021 +0300

    scripts: rem unsupported platform

commit c1645e247f18d384a980c60d3a94b9363f83f174
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 18:47:57 2021 +0300

    all: rollback more

commit 989811b5e38498234dc11baf5dd153c76b9dada4
Merge: 976bdfbd 2d704242
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 18:30:42 2021 +0300

    Merge branch 'master' into 2275-upd

commit 976bdfbdd44983f4cd657a486b94ff63f5885fd5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 18:28:23 2021 +0300

    aghtest: fix os_windows

commit 9e85080eefe882d72c939969f7008e3c46467c0c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 10 18:15:37 2021 +0300

    all: rewrite windows workaround, imp code, docs

commit 35a0b1d8656640a962fe9ae019c3d665f42707ce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jan 21 20:38:17 2021 +0300

    all: update go and backend tools
This commit is contained in:
Ainar Garipov
2021-03-11 12:17:54 +03:00
parent 55d4c7ee4f
commit c08bf86b71
24 changed files with 849 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/updater/updater_test.go
View File

@@ -5,7 +5,6 @@ import (
"net"
"net/http"
"net/url"
"os"
"path"
"path/filepath"
"strconv"
@@ -101,12 +100,7 @@ func TestUpdateGetVersion(t *testing.T) {
}
func TestUpdate(t *testing.T) {
// TODO(a.garipov): Uncomment and remove the code below in Go 1.15.
//
// wd := t.TempDir()
wd, err := ioutil.TempDir("", "aghtest")
assert.Nil(t, err)
t.Cleanup(func() { assert.Nil(t, os.RemoveAll(wd)) })
wd := aghtest.PrepareTestDir(t)
assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
@@ -172,12 +166,7 @@ func TestUpdate(t *testing.T) {
}
func TestUpdateWindows(t *testing.T) {
// TODO(a.garipov): Uncomment and remove the code below in Go 1.15.
//
// wd := t.TempDir()
wd, err := ioutil.TempDir("", "aghtest")
assert.Nil(t, err)
t.Cleanup(func() { assert.Nil(t, os.RemoveAll(wd)) })
wd := aghtest.PrepareTestDir(t)
assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))