RHINENG-19230: fix tests related to baselines

Author: MichaelMraka

conf/local.env

@@ -31,4 +31,4 @@ TZ=UTC
 GORUN=on
 
 # don't put "" or '' around the text otherwise they'll be included into content
-POD_CONFIG=label=upload;baseline_change_eval=false;use_testing_db
+POD_CONFIG=label=upload;template_change_eval=false;use_testing_db

conf/test.env

@@ -10,7 +10,7 @@ DB_PASSWD=passwd
 LIMIT_PAGE_SIZE=false
 
 # don't put "" or '' around the text otherwise they'll be included into content
-POD_CONFIG=label=upload;vmaas_call_max_retries=100;baseline_change_eval=false;update_users;update_db_config;use_testing_db
+POD_CONFIG=label=upload;vmaas_call_max_retries=100;template_change_eval=false;update_users;update_db_config;use_testing_db
 
 KESSEL_URL=platform:9005
 KESSEL_INSECURE=true

manager/controllers/advisory_systems_export_test.go

@@ -37,7 +37,7 @@ func TestAdvisorySystemsExportCSV(t *testing.T) {
 	assert.Equal(t, "00000000-0000-0000-0000-000000000001,2020-09-22T16:00:00Z,false,RHEL 8.10,8.10,2018-08-26T16:00:00Z,"+
 		"2018-09-02T16:00:00Z,2018-09-09T16:00:00Z,2018-08-26T16:00:00Z,\"[{'key':'k1','namespace':'ns1','value':'val1'},"+
 		"{'key':'k2','namespace':'ns1','value':'val2'}]\",\"[{'id':'inventory-group-1','name':'group1'}]\","+
-		"1,baseline_1-1,temp1-1,99900000-0000-0000-0000-000000000001,Installable,false,false,"+
+		"0,,temp1-1,99900000-0000-0000-0000-000000000001,Installable,false,false,"+
 		"00000000-0000-0000-0000-000000000001",
 		lines[1])
 }

manager/controllers/advisory_systems_test.go

@@ -5,6 +5,7 @@ import (
 	"app/base/utils"
 	"fmt"
 	"net/http"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -28,8 +29,8 @@ func TestAdvisorySystemsDefault(t *testing.T) {
 	assert.Equal(t, "2018-09-09 16:00:00 +0000 UTC", output.Data[0].Attributes.CulledTimestamp.String())
 	assert.Equal(t, "2018-08-26 16:00:00 +0000 UTC", output.Data[0].Attributes.Created.String())
 	assert.Equal(t, SystemTagsList{{"k1", "ns1", "val1"}, {"k2", "ns1", "val2"}}, output.Data[0].Attributes.Tags)
-	assert.Equal(t, "baseline_1-1", output.Data[0].Attributes.BaselineName)
-	assert.Equal(t, int64(1), output.Data[0].Attributes.BaselineID)
+	assert.Equal(t, "", output.Data[0].Attributes.BaselineName)
+	assert.Equal(t, int64(0), output.Data[0].Attributes.BaselineID)
 	assert.False(t, output.Data[0].Attributes.SatelliteManaged)
 	assert.False(t, output.Data[0].Attributes.BuiltPkgcache)
 }
@@ -82,6 +83,9 @@ func TestAdvisorySystemsSorts(t *testing.T) {
 	core.SetupTest(t)
 
 	for sort := range AdvisorySystemsFields {
+		if strings.HasPrefix(sort, "baseline") {
+			continue // ignore obsoleted baseline attributes
+		}
 		w := CreateRequestRouterWithPath("GET", "/:advisory_id", "RH-1", fmt.Sprintf("?sort=%v", sort), nil, "",
 			AdvisorySystemsListHandler)
 

manager/controllers/system_detail_test.go

@@ -31,9 +31,9 @@ func TestSystemDetailDefault1(t *testing.T) {
 	assert.Equal(t, "10", output.Data.Attributes.OSMinor)
 	assert.Equal(t, "8.10", output.Data.Attributes.Rhsm)
 	assert.Equal(t, "RHEL 8.10", output.Data.Attributes.OS)
-	assert.Equal(t, "baseline_1-1", output.Data.Attributes.BaselineName)
-	assert.Equal(t, true, *output.Data.Attributes.BaselineUpToDate)
-	assert.Equal(t, int64(1), output.Data.Attributes.BaselineID)
+	assert.Equal(t, "", output.Data.Attributes.BaselineName)
+	assert.Nil(t, output.Data.Attributes.BaselineUpToDate)
+	assert.Equal(t, int64(0), output.Data.Attributes.BaselineID)
 }
 
 func TestSystemDetailDefault2(t *testing.T) {

manager/controllers/systems_export_test.go

@@ -42,8 +42,8 @@ func TestSystemsExportJSON(t *testing.T) {
 	assert.Equal(t, "2018-09-09 16:00:00 +0000 UTC", output[0].SystemItemAttributes.CulledTimestamp.String())
 	assert.Equal(t, "2018-08-26 16:00:00 +0000 UTC", output[0].SystemItemAttributes.Created.String())
 	assert.Equal(t, SystemTagsList{{"k1", "ns1", "val1"}, {"k2", "ns1", "val2"}}, output[0].SystemItemAttributes.Tags)
-	assert.Equal(t, "baseline_1-1", output[0].SystemItemAttributes.BaselineName)
-	assert.Equal(t, int64(1), output[0].SystemItemAttributes.BaselineID)
+	assert.Equal(t, "", output[0].SystemItemAttributes.BaselineName)
+	assert.Equal(t, int64(0), output[0].SystemItemAttributes.BaselineID)
 }
 
 func TestSystemsExportCSV(t *testing.T) {
@@ -58,9 +58,9 @@ func TestSystemsExportCSV(t *testing.T) {
 
 	assert.Equal(t, "00000000-0000-0000-0000-000000000001,00000000-0000-0000-0000-000000000001,RHEL 8.10,8.10,"+
 		"\"[{'key':'k1','namespace':'ns1','value':'val1'},{'key':'k2','namespace':'ns1','value':'val2'}]\","+
-		"2018-09-22T16:00:00Z,2,2,1,0,0,baseline_1-1,"+
+		"2018-09-22T16:00:00Z,2,2,1,0,0,,"+
 		"2020-09-22T16:00:00Z,2018-08-26T16:00:00Z,2018-09-02T16:00:00Z,2018-09-09T16:00:00Z,2018-08-26T16:00:00Z,"+
-		"false,false,false,0,0,2,2,1,0,2,3,3,3,1,temp1-1,99900000-0000-0000-0000-000000000001,"+
+		"false,false,false,0,0,2,2,1,0,2,3,3,3,0,temp1-1,99900000-0000-0000-0000-000000000001,"+
 		"\"[{'id':'inventory-group-1','name':'group1'}]\",x86_64",
 		lines[1])
 }
@@ -115,17 +115,6 @@ func TestSystemsExportWorkloads(t *testing.T) {
 	assert.Equal(t, "00000000-0000-0000-0000-000000000001", output[0].ID)
 }
 
-func TestSystemsExportBaselineFilter(t *testing.T) {
-	w := makeRequest(t, "/?filter[baseline_name]=baseline_1-1", "application/json")
-
-	var output []SystemDBLookup
-	CheckResponse(t, w, http.StatusOK, &output)
-
-	assert.Equal(t, 3, len(output))
-	assert.Equal(t, "00000000-0000-0000-0000-000000000001", output[0].ID)
-	assert.Equal(t, "00000000-0000-0000-0000-000000000002", output[1].ID)
-}
-
 func TestSystemsExportFilterPartialOS(t *testing.T) {
 	w := makeRequest(t, "/?filter[osname]=RHEL&filter[osmajor]=8&filter[osminor]=1", "application/json")
 

manager/controllers/systems_ids_test.go

@@ -124,14 +124,6 @@ func TestSystemsIDsFilterAdvCount4(t *testing.T) {
 	assert.Equal(t, output.Data[0].ID, outputIDs.IDs[0])
 }
 
-func TestSystemsIDsFilterBaseline(t *testing.T) {
-	output := testSystemsIDs(t, "?filter[baseline_name]=baseline_1-1", 1)
-	assert.Equal(t, 3, len(output.IDs))
-	assert.Equal(t, "00000000-0000-0000-0000-000000000001", output.IDs[0])
-	assert.Equal(t, "00000000-0000-0000-0000-000000000018", output.IDs[1])
-	assert.Equal(t, "00000000-0000-0000-0000-000000000002", output.IDs[2])
-}
-
 func TestSystemsIDsFilterNotExisting(t *testing.T) {
 	statusCode, errResp := testSystemsIDsError(t, "?filter[not-existing]=1")
 	assert.Equal(t, http.StatusBadRequest, statusCode)

manager/controllers/systems_test.go

@@ -31,8 +31,8 @@ func TestSystemsDefault(t *testing.T) {
 	assert.Equal(t, "2018-09-09 16:00:00 +0000 UTC", output.Data[0].Attributes.CulledTimestamp.String())
 	assert.Equal(t, "2018-08-26 16:00:00 +0000 UTC", output.Data[0].Attributes.Created.String())
 	assert.Equal(t, SystemTagsList{{"k1", "ns1", "val1"}, {"k2", "ns1", "val2"}}, output.Data[0].Attributes.Tags)
-	assert.Equal(t, "baseline_1-1", output.Data[0].Attributes.BaselineName)
-	assert.Equal(t, int64(1), output.Data[0].Attributes.BaselineID)
+	assert.Equal(t, "", output.Data[0].Attributes.BaselineName)
+	assert.Equal(t, int64(0), output.Data[0].Attributes.BaselineID)
 	assert.False(t, output.Data[0].Attributes.SatelliteManaged)
 	assert.False(t, output.Data[0].Attributes.BuiltPkgcache)
 	assert.Equal(t, "x86_64", output.Data[0].Attributes.Arch)
@@ -196,14 +196,6 @@ func TestSystemsFilterAdvCount4(t *testing.T) {
 	assert.Equal(t, 4, output.Data[0].Attributes.OtherCount)
 }
 
-func TestSystemsFilterBaseline(t *testing.T) {
-	output := testSystems(t, "?filter[baseline_name]=baseline_1-1", 1)
-	assert.Equal(t, 3, len(output.Data))
-	assert.Equal(t, "00000000-0000-0000-0000-000000000001", output.Data[0].ID)
-	assert.Equal(t, "00000000-0000-0000-0000-000000000018", output.Data[1].ID)
-	assert.Equal(t, "00000000-0000-0000-0000-000000000002", output.Data[2].ID)
-}
-
 func TestSystemsFilterNotExisting(t *testing.T) {
 	statusCode, errResp := testSystemsError(t, "?filter[not-existing]=1")
 	assert.Equal(t, http.StatusBadRequest, statusCode)