GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-09-05 16:47:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

windows/svc: use separate (and more descriptive) service names in tests

Browse Source 
Notably, the DisplayName field was set to the same thing in both
sys.TestExample and mrg.TestMyService, which may explain the collision
reported in golang/go#59298.

Moreover, the adjective ”my” conveys no information whatsoever — we
shouldn't use it in tests or examples.

Also skip the tests that install services if GO_BUILDER_NAME is not
set, to reduce the likelihood of 'go test all' in a user's working
directory being mistaken for a malicious or compromised program.

Fixes golang/go#59298.

Change-Id: Ib00bf7400bfaa34e1a1d49125c43b97019b53c82
Reviewed-on: https://go-review.googlesource.com/c/sys/+/481015
Reviewed-by: Carlos Amedee <carlos@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Bryan Mills <bcmills@google.com>
This commit is contained in:
Bryan C. Mills
2023-05-04 17:52:42 +00:00
committed by Gopher Robot
parent ca59edaa5a
commit 1911637744
4 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/svc/svc_test.go
+10 -6
View File
@@ -77,11 +77,15 @@ func stopAndDeleteIfInstalled(t *testing.T, m *mgr.Mgr, name string) {
}
func TestExample(t *testing.T) {
if testing.Short() && os.Getenv("GO_BUILDER_NAME") != "" {
t.Skip("skipping test in short mode - it modifies system services")
if os.Getenv("GO_BUILDER_NAME") == "" {
// Don't install services on arbitrary users' machines.
t.Skip("skipping test that modifies system services: GO_BUILDER_NAME not set")
}
if testing.Short() {
t.Skip("skipping test in short mode that modifies system services")
}
const name = "myservice"
const name = "svctestservice"
m, err := mgr.Connect()
if err != nil {
@@ -103,7 +107,7 @@ func TestExample(t *testing.T) {
stopAndDeleteIfInstalled(t, m, name)
s, err := m.CreateService(name, exepath, mgr.Config{DisplayName: "my service"}, "is", "auto-started")
s, err := m.CreateService(name, exepath, mgr.Config{DisplayName: "x-sys svc test service"}, "-name", name)
if err != nil {
t.Fatalf("CreateService(%s) failed: %v", name, err)
}
@@ -141,7 +145,7 @@ func TestExample(t *testing.T) {
t.Fatalf("Delete failed: %s", err)
}
out, err := exec.Command("wevtutil.exe", "qe", "Application", "/q:*[System[Provider[@Name='myservice']]]", "/rd:true", "/c:10").CombinedOutput()
out, err := exec.Command("wevtutil.exe", "qe", "Application", "/q:*[System[Provider[@Name='"+name+"']]]", "/rd:true", "/c:10").CombinedOutput()
if err != nil {
t.Fatalf("wevtutil failed: %v\n%v", err, string(out))
}
@@ -149,7 +153,7 @@ func TestExample(t *testing.T) {
// Test context passing (see servicemain in sys_386.s and sys_amd64.s).
want += "-123456"
if !strings.Contains(string(out), want) {
t.Errorf("%q string does not contain %q", string(out), want)
t.Errorf("%q string does not contain %q", out, want)
}
}