Fake-support the label=experimental param

webapp/api_handlers.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 	"time"
 
 	models "github.com/web-platform-tests/wpt.fyi/shared"
@@ -19,6 +20,8 @@ import (
 	"google.golang.org/appengine/datastore"
 )
 
+const experimentalLabel = `experimental`
+
 // apiTestRunsHandler is responsible for emitting test-run JSON for all the runs at a given SHA.
 //
 // URL Params:
@@ -48,6 +51,9 @@ func apiTestRunsHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	labels := ParseLabelsParam(r)
+	experimentalBrowsers := labels != nil && labels.Contains(experimentalLabel)
+
 	var testRuns []models.TestRun
 	var limit int
 	if limit, err = ParseMaxCountParam(r); err != nil {
@@ -61,6 +67,9 @@ func apiTestRunsHandler(w http.ResponseWriter, r *http.Request) {
 
 	for _, browserName := range browserNames {
 		var testRunResults []models.TestRun
+		if experimentalBrowsers {
+			browserName = browserName + "-" + experimentalLabel
+		}
 		query := baseQuery.Filter("BrowserName =", browserName)
 		if runSHA != "" && runSHA != "latest" {
 			query = query.Filter("Revision =", runSHA)
@@ -69,6 +78,11 @@ func apiTestRunsHandler(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
+		if experimentalBrowsers {
+			for i := range testRunResults {
+				testRunResults[i].BrowserName = strings.Replace(testRunResults[i].BrowserName, "-"+experimentalLabel, "", 1)
+			}
+		}
 		testRuns = append(testRuns, testRunResults...)
 	}
 

webapp/params.go

@@ -164,29 +164,43 @@ func ParseDiffFilterParams(r *http.Request) (param DiffFilterParam, err error) {
 	return param, nil
 }
 
-// ParsePathsParam returns a set list of test paths to include, or nil if no filter is provided (and all tests should be
-// included). It parses the 'paths' parameter, split on commas, and also checks for the (repeatable) 'path' params.
+// ParsePathsParam returns a set list of test paths to include, or nil if no
+// filter is provided (and all tests should be included). It parses the 'paths'
+// parameter, split on commas, and also checks for the (repeatable) 'path' params
 func ParsePathsParam(r *http.Request) (paths mapset.Set) {
-	pathParams := r.URL.Query()["path"]
-	pathsParam := r.URL.Query().Get("paths")
-	if len(pathParams) == 0 && pathsParam == "" {
+	return ParseRepeatedParam(r, "path", "paths")
+}
+
+// ParseLabelsParam returns a set list of test-run labels to include, or nil if
+// no labels are provided.
+func ParseLabelsParam(r *http.Request) (labels mapset.Set) {
+	return ParseRepeatedParam(r, "label", "labels")
+}
+
+// ParseRepeatedParam parses a param that may be a plural name, with all values
+// comma-separated, or a repeated singular param.
+// e.g. ?label=foo&label=bar vs ?labels=foo,bar
+func ParseRepeatedParam(r *http.Request, singular string, plural string) (params mapset.Set) {
+	repeatedParam := r.URL.Query()[singular]
+	pluralParam := r.URL.Query().Get(plural)
+	if len(repeatedParam) == 0 && pluralParam == "" {
 		return nil
 	}
 
-	paths = mapset.NewSet()
-	for _, path := range pathParams {
-		paths.Add(path)
+	params = mapset.NewSet()
+	for _, label := range repeatedParam {
+		params.Add(label)
 	}
-	if pathsParam != "" {
-		for _, path := range strings.Split(pathsParam, ",") {
-			paths.Add(path)
+	if pluralParam != "" {
+		for _, label := range strings.Split(pluralParam, ",") {
+			params.Add(label)
 		}
 	}
-	if paths.Contains("") {
-		paths.Remove("")
+	if params.Contains("") {
+		params.Remove("")
 	}
-	if paths.Cardinality() == 0 {
+	if params.Cardinality() == 0 {
 		return nil
 	}
-	return paths
+	return params
 }

webapp/params_test.go

@@ -261,3 +261,37 @@ func TestParseDiffFilterParam_Invalid(t *testing.T) {
 	_, err := ParseDiffFilterParams(r)
 	assert.NotNil(t, err)
 }
+
+func TestParseLabelsParam_Missing(t *testing.T) {
+	r := httptest.NewRequest("GET", "http://wpt.fyi/api/runs", nil)
+	labels := ParseLabelsParam(r)
+	assert.Nil(t, labels)
+}
+
+func TestParseLabelsParam_Empty(t *testing.T) {
+	r := httptest.NewRequest("GET", "http://wpt.fyi/api/runs?label=", nil)
+	labels := ParseLabelsParam(r)
+	assert.Nil(t, labels)
+
+	r = httptest.NewRequest("GET", "http://wpt.fyi/api/runs?labels=", nil)
+	labels = ParseLabelsParam(r)
+	assert.Nil(t, labels)
+}
+
+func TestParseLabelsParam_Label_Duplicate(t *testing.T) {
+	r := httptest.NewRequest("GET", "http://wpt.fyi/api/runs?label=experimental&label=experimental", nil)
+	labels := ParseLabelsParam(r)
+	assert.Equal(t, 1, labels.Cardinality())
+}
+
+func TestParseLabelsParam_Labels_Duplicate(t *testing.T) {
+	r := httptest.NewRequest("GET", "http://wpt.fyi/api/runs?labels=experimental,experimental", nil)
+	labels := ParseLabelsParam(r)
+	assert.Equal(t, 1, labels.Cardinality())
+}
+
+func TestParseLabelsParam_LabelsAndLabel_Duplicate(t *testing.T) {
+	r := httptest.NewRequest("GET", "http://wpt.fyi/api/runs?labels=experimental&label=experimental", nil)
+	labels := ParseLabelsParam(r)
+	assert.Equal(t, 1, labels.Cardinality())
+}

webapp/test_results_handler.go

@@ -119,7 +119,13 @@ func getTestRunsAndSources(r *http.Request, runSHA string) (testRunSources []str
 			testRunSources = append(testRunSources, fmt.Sprintf(singleRunURL, afterSpec.Revision, afterSpec.Platform))
 		}
 	} else {
-		const sourceURL = `/api/runs?sha=%s`
+		var sourceURL = `/api/runs?sha=%s`
+		labels := ParseLabelsParam(r)
+		if labels != nil {
+			for label := range labels.Iterator().C {
+				sourceURL = sourceURL + "&label=" + label.(string)
+			}
+		}
 		testRunSources = []string{fmt.Sprintf(sourceURL, runSHA)}
 	}
 

webapp/test_run_handler.go

@@ -31,6 +31,13 @@ func handleTestRunGet(w http.ResponseWriter, r *http.Request) {
 	}
 	sourceURL := fmt.Sprintf(`/api/runs?max-count=%d`, maxCount)
 
+	labels := ParseLabelsParam(r)
+	if labels != nil {
+		for label := range labels.Iterator().C {
+			sourceURL = sourceURL + "&label=" + label.(string)
+		}
+	}
+
 	// Serialize the data + pipe through the test-runs.html template.
 	testRunSourcesBytes, err := json.Marshal([]string{sourceURL})
 	if err != nil {