more

keybase · Aug 12, 2019 · 5ebcbd5 · 5ebcbd5
1 parent 9133c5a
commit 5ebcbd5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -473,7 +473,7 @@ def testGo(prefix, packagesToTest) {
           timeout(activity: true, time: 180, unit: 'SECONDS') {
           // Ignore the `dokan` directory since it contains lots of c code.
           // Ignore the `protocol` directory, autogeneration has some critques
-          sh 'go list -f "{{.Dir}}" ./...  | fgrep -v dokan | fgrep -v protocol | xargs realpath --relative-to=. | xargs golangci-lint run'
+          sh 'go list -f "{{.Dir}}" ./...  | fgrep -v dokan | xargs realpath --relative-to=. | xargs golangci-lint run'
           }
         }
       }

diff --git a/go/systests/team_tx_test.go b/go/systests/team_tx_test.go
@@ -96,7 +96,8 @@ func testTeamTx1(t *testing.T, byUV bool) {
 
 	teamObj = ann.loadTeam(team, true /* admin */)
 	tx = teams.CreateAddMemberTx(teamObj)
-	tx.AddMemberByUsername(context.Background(), bob.username, keybase1.TeamRole_WRITER, nil)
+	err = tx.AddMemberByUsername(context.Background(), bob.username, keybase1.TeamRole_WRITER, nil)
+	require.NoError(t, err)
 
 	err = tx.Post(libkb.NewMetaContextForTest(*ann.tc))
 	require.NoError(t, err)
@@ -176,8 +177,10 @@ func TestTeamTxDependency(t *testing.T) {
 	teamObj = ann.loadTeam(team, true /* admin */)
 
 	tx := teams.CreateAddMemberTx(teamObj)
-	tx.AddMemberByUsername(context.Background(), tracy.username, keybase1.TeamRole_READER, nil)
-	tx.AddMemberByUsername(context.Background(), bob.username, keybase1.TeamRole_WRITER, nil)
+	err = tx.AddMemberByUsername(context.Background(), tracy.username, keybase1.TeamRole_READER, nil)
+	require.NoError(t, err)
+	err = tx.AddMemberByUsername(context.Background(), bob.username, keybase1.TeamRole_WRITER, nil)
+	require.NoError(t, err)
 
 	payloads := tx.DebugPayloads()
 	require.Equal(t, 3, len(payloads))
@@ -210,8 +213,10 @@ func TestTeamTxDependency(t *testing.T) {
 	bob.loginAfterResetPukless()
 
 	tx = teams.CreateAddMemberTx(teamObj)
-	tx.AddMemberByAssertionOrEmail(context.Background(), fmt.Sprintf("%s@rooter", tracy.username), keybase1.TeamRole_WRITER, nil)
-	tx.AddMemberByUsername(context.Background(), bob.username, keybase1.TeamRole_WRITER, nil)
+	_, _, _, err = tx.AddMemberByAssertionOrEmail(context.Background(), fmt.Sprintf("%s@rooter", tracy.username), keybase1.TeamRole_WRITER, nil)
+	require.NoError(t, err)
+	err = tx.AddMemberByUsername(context.Background(), bob.username, keybase1.TeamRole_WRITER, nil)
+	require.NoError(t, err)
 
 	payloads = tx.DebugPayloads()
 	require.Equal(t, 3, len(payloads))