[test] fix git context tests

We use UBP now, there is no more unleashed.

Also, remove the "ff" feature flag code (which was for PVC). It was mutating the username, resulting in Code 460 errors on createWorkspace

Author: kylos101

test/tests/workspace/contexts_test.go

@@ -111,102 +111,77 @@ func runContextTests(t *testing.T, tests []ContextTest) {
 	f := features.New("context").
 		WithLabel("component", "server").
 		Assess("should run context tests", func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
-			ffs := []struct {
-				Name string
-				FF   string
-			}{
-				{Name: "classic"},
-				// {Name: "pvc", FF: "persistent_volume_claim"},
-			}
 
-			for _, ff := range ffs {
-				func() {
-					sctx, scancel := context.WithTimeout(context.Background(), 5*time.Minute)
-					defer scancel()
+			sctx, scancel := context.WithTimeout(context.Background(), time.Duration(5*len(tests))*time.Minute)
+			defer scancel()
 
-					api := integration.NewComponentAPI(sctx, cfg.Namespace(), kubeconfig, cfg.Client())
-					defer api.Done(t)
+			api := integration.NewComponentAPI(sctx, cfg.Namespace(), kubeconfig, cfg.Client())
+			defer api.Done(t)
 
-					username := username + ff.Name
-					userId, err := api.CreateUser(username, userToken)
-					if err != nil {
-						t.Fatal(err)
+			for _, test := range tests {
+				test := test
+				t.Run(test.ContextURL, func(t *testing.T) {
+					report.SetupReport(t, report.FeatureContentInit, fmt.Sprintf("Test to open %v", test.ContextURL))
+					if test.Skip {
+						t.SkipNow()
 					}
 
-					if err := api.UpdateUserFeatureFlag(userId, ff.FF); err != nil {
-						t.Fatal(err)
-					}
-				}()
-			}
+					t.Parallel()
 
-			for _, ff := range ffs {
-				for _, test := range tests {
-					test := test
-					t.Run(test.ContextURL+"_"+ff.Name, func(t *testing.T) {
-						report.SetupReport(t, report.FeatureContentInit, fmt.Sprintf("Test to open %v", test.ContextURL))
-						if test.Skip {
-							t.SkipNow()
-						}
+					ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*len(tests))*time.Minute)
+					defer cancel()
 
-						t.Parallel()
+					api := integration.NewComponentAPI(ctx, cfg.Namespace(), kubeconfig, cfg.Client())
+					defer api.Done(t)
 
-						username := username + ff.Name
+					nfo, stopWs, err := integration.LaunchWorkspaceFromContextURL(t, ctx, test.ContextURL, username, api)
+					if err != nil {
+						t.Fatal(err)
+					}
 
-						ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*len(tests)*len(ffs))*time.Minute)
-						defer cancel()
+					t.Cleanup(func() {
+						sctx, scancel := context.WithTimeout(context.Background(), 10*time.Minute)
+						defer scancel()
 
-						api := integration.NewComponentAPI(ctx, cfg.Namespace(), kubeconfig, cfg.Client())
-						defer api.Done(t)
+						sapi := integration.NewComponentAPI(sctx, cfg.Namespace(), kubeconfig, cfg.Client())
+						defer sapi.Done(t)
 
-						nfo, stopWs, err := integration.LaunchWorkspaceFromContextURL(t, ctx, test.ContextURL, username, api)
+						_, err := stopWs(true, sapi)
 						if err != nil {
 							t.Fatal(err)
 						}
+					})
 
-						t.Cleanup(func() {
-							sctx, scancel := context.WithTimeout(context.Background(), 10*time.Minute)
-							defer scancel()
-
-							sapi := integration.NewComponentAPI(sctx, cfg.Namespace(), kubeconfig, cfg.Client())
-							defer sapi.Done(t)
-
-							_, err := stopWs(true, sapi)
-							if err != nil {
-								t.Fatal(err)
-							}
-						})
-
-						rsa, closer, err := integration.Instrument(integration.ComponentWorkspace, "workspace", cfg.Namespace(), kubeconfig, cfg.Client(), integration.WithInstanceID(nfo.LatestInstance.ID))
-						if err != nil {
-							t.Fatal(err)
-						}
-						defer rsa.Close()
-						integration.DeferCloser(t, closer)
+					rsa, closer, err := integration.Instrument(integration.ComponentWorkspace, "workspace", cfg.Namespace(), kubeconfig, cfg.Client(), integration.WithInstanceID(nfo.LatestInstance.ID))
+					if err != nil {
+						t.Fatal(err)
+					}
+					defer rsa.Close()
+					integration.DeferCloser(t, closer)
 
-						if test.ExpectedBranch == "" && test.ExpectedBranchFunc == nil {
-							return
-						}
+					if test.ExpectedBranch == "" && test.ExpectedBranchFunc == nil {
+						return
+					}
 
-						// get actual from workspace
-						git := integration.Git(rsa)
-						err = git.ConfigSafeDirectory()
-						if err != nil {
-							t.Fatal(err)
-						}
-						actBranch, err := git.GetBranch(test.WorkspaceRoot, test.IgnoreError)
-						if err != nil {
-							t.Fatal(err)
-						}
+					// get actual from workspace
+					git := integration.Git(rsa)
+					err = git.ConfigSafeDirectory()
+					if err != nil {
+						t.Fatal(err)
+					}
+					actBranch, err := git.GetBranch(test.WorkspaceRoot, test.IgnoreError)
+					if err != nil {
+						t.Fatal(err)
+					}
 
-						expectedBranch := test.ExpectedBranch
-						if test.ExpectedBranchFunc != nil {
-							expectedBranch = test.ExpectedBranchFunc(username)
-						}
-						if actBranch != expectedBranch {
-							t.Fatalf("expected branch '%s', got '%s'!", expectedBranch, actBranch)
-						}
-					})
-				}
+					expectedBranch := test.ExpectedBranch
+					if test.ExpectedBranchFunc != nil {
+						expectedBranch = test.ExpectedBranchFunc(username)
+					}
+					if actBranch != expectedBranch {
+						t.Fatalf("expected branch '%s', got '%s'!", expectedBranch, actBranch)
+					}
+				})
 			}
 			return ctx
 		}).