From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 24 Jun 2021 03:01:33 +0000 (-0700)
Subject: os/user: simplify skipping listGroups test
X-Git-Tag: go1.18beta1~1585
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f4cd001b57;p=gostls13.git

os/user: simplify skipping listGroups test

This is not implemented on AIX and Illumos, and we already have a
mechanism to skip the test case -- let's use it.

Change-Id: Idb1cc2d716cf6d0731e93dfc3aa7853b9edec41f
Reviewed-on: https://go-review.googlesource.com/c/go/+/330752
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
---

diff --git a/src/os/user/listgroups_aix.go b/src/os/user/listgroups_aix.go
index d2fdfdc6b1..fbc1deb03f 100644
--- a/src/os/user/listgroups_aix.go
+++ b/src/os/user/listgroups_aix.go
@@ -9,6 +9,12 @@ package user
 
 import "fmt"
 
+// Not implemented on AIX, see golang.org/issue/30563.
+
+func init() {
+	groupListImplemented = false
+}
+
 func listGroups(u *User) ([]string, error) {
 	return nil, fmt.Errorf("user: list groups for %s: not supported on AIX", u.Username)
 }
diff --git a/src/os/user/listgroups_illumos.go b/src/os/user/listgroups_illumos.go
index d25e0339b9..e783b26080 100644
--- a/src/os/user/listgroups_illumos.go
+++ b/src/os/user/listgroups_illumos.go
@@ -13,6 +13,12 @@ package user
 
 import "fmt"
 
+// Not implemented on illumos, see golang.org/issue/14709.
+
+func init() {
+	groupListImplemented = false
+}
+
 func listGroups(u *User) ([]string, error) {
 	return nil, fmt.Errorf("user: list groups for %s: not supported on illumos", u.Username)
 }
diff --git a/src/os/user/user_test.go b/src/os/user/user_test.go
index d8a465edac..80251749a7 100644
--- a/src/os/user/user_test.go
+++ b/src/os/user/user_test.go
@@ -5,7 +5,6 @@
 package user
 
 import (
-	"runtime"
 	"testing"
 )
 
@@ -128,12 +127,6 @@ func checkGroupList(t *testing.T) {
 
 func TestGroupIds(t *testing.T) {
 	checkGroupList(t)
-	if runtime.GOOS == "aix" {
-		t.Skip("skipping GroupIds, see golang.org/issue/30563")
-	}
-	if runtime.GOOS == "illumos" {
-		t.Skip("skipping GroupIds, see golang.org/issue/14709")
-	}
 	user, err := Current()
 	if err != nil {
 		t.Fatalf("Current(): %v", err)