|
|
|
@ -309,16 +309,12 @@ func TestOneNodeUpAuth(t *testing.T) {
|
|
|
|
alreadyLoggedIn: true,
|
|
|
|
alreadyLoggedIn: true,
|
|
|
|
needsNewAuthURL: false,
|
|
|
|
needsNewAuthURL: false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// TODO(alexc): This test is failing because of a bug in `tailscale up` where
|
|
|
|
{
|
|
|
|
// it waits for ipn to enter the "Running" state. If we're already logged in
|
|
|
|
name: "up-with-force-reauth-after-login",
|
|
|
|
// and running, this completes immediately, before we've had a chance to show
|
|
|
|
args: []string{"up", "--force-reauth"},
|
|
|
|
// the user the auth URL.
|
|
|
|
alreadyLoggedIn: true,
|
|
|
|
// {
|
|
|
|
needsNewAuthURL: true,
|
|
|
|
// name: "up-with-force-reauth-after-login",
|
|
|
|
},
|
|
|
|
// args: []string{"up", "--force-reauth"},
|
|
|
|
|
|
|
|
// alreadyLoggedIn: true,
|
|
|
|
|
|
|
|
// needsNewAuthURL: true,
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
name: "up-with-auth-key-after-login",
|
|
|
|
name: "up-with-auth-key-after-login",
|
|
|
|
args: []string{"up", "--auth-key=opensesame"},
|
|
|
|
args: []string{"up", "--auth-key=opensesame"},
|
|
|
|
@ -341,6 +337,14 @@ func TestOneNodeUpAuth(t *testing.T) {
|
|
|
|
t.Run(fmt.Sprintf("%s-seamless-%t", tt.name, useSeamlessKeyRenewal), func(t *testing.T) {
|
|
|
|
t.Run(fmt.Sprintf("%s-seamless-%t", tt.name, useSeamlessKeyRenewal), func(t *testing.T) {
|
|
|
|
tstest.Parallel(t)
|
|
|
|
tstest.Parallel(t)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TODO(alexc): This test is failing because of a bug in `tailscale up` where
|
|
|
|
|
|
|
|
// it waits for ipn to enter the "Running" state. If we're already logged in
|
|
|
|
|
|
|
|
// and running, this completes immediately, before we've had a chance to show
|
|
|
|
|
|
|
|
// the user the auth URL.
|
|
|
|
|
|
|
|
if tt.name == "up-with-force-reauth-after-login" {
|
|
|
|
|
|
|
|
t.Skip()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
env := NewTestEnv(t, ConfigureControl(
|
|
|
|
env := NewTestEnv(t, ConfigureControl(
|
|
|
|
func(control *testcontrol.Server) {
|
|
|
|
func(control *testcontrol.Server) {
|
|
|
|
if tt.authKey != "" {
|
|
|
|
if tt.authKey != "" {
|
|
|
|
|