CBG-5558 remove TestsUseXattrs code

Author: torcolvin

base/bootstrap_test.go

@@ -52,8 +52,9 @@ func TestBootstrapRefCounting(t *testing.T) {
 		assert.Equal(c, int32(GTestBucketPool.numBuckets), GTestBucketPool.stats.TotalBucketInitCount.Load())
 	}, 2*time.Minute, 5*time.Millisecond) // Wait for bucket pool to be initialized, since GetConfigBuckets requires equal buckets to TestBucketPool.numBuckets
 
+	bootstrapConfigInXattrs := true
 	var perBucketCredentialsConfig map[string]*CredentialsConfig
-	cluster, err := NewCouchbaseCluster(ctx, TestClusterSpec(t), perBucketCredentialsConfig, TestUseXattrs(), false, CachedClusterConnections)
+	cluster, err := NewCouchbaseCluster(ctx, TestClusterSpec(t), perBucketCredentialsConfig, bootstrapConfigInXattrs, false, CachedClusterConnections)
 	require.NoError(t, err)
 	defer cluster.Close()
 	require.NotNil(t, cluster)
@@ -145,7 +146,9 @@ func newTestBootstrapConnection(t *testing.T) BootstrapConnection {
 		t.Cleanup(cluster.Close)
 		return cluster
 	}
-	cluster, err := NewCouchbaseCluster(ctx, TestClusterSpec(t), nil, TestUseXattrs(), false, CachedClusterConnections)
+
+	bootstrapConfigInXattrs := true
+	cluster, err := NewCouchbaseCluster(ctx, TestClusterSpec(t), nil, bootstrapConfigInXattrs, false, CachedClusterConnections)
 	require.NoError(t, err)
 	t.Cleanup(cluster.Close)
 	return cluster

base/bucket_gocb_test.go

@@ -505,18 +505,8 @@ func TestTouchCASSemantics(t *testing.T) {
 	require.NotEqual(t, getTouchCAS, clearTouchCAS, "Touch should bump CAS when clearing TTL")
 }
 
-func SkipXattrTestsIfNotEnabled(t *testing.T) {
-
-	if !TestUseXattrs() {
-		t.Skip("XATTR based tests not enabled.  Enable via SG_TEST_USE_XATTRS=true environment variable")
-	}
-}
-
 // TestXattrWriteCasSimple.  Validates basic write of document with xattr, and retrieval of the same doc w/ xattr.
 func TestXattrWriteCasSimple(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -582,9 +572,6 @@ func TestXattrWriteCasSimple(t *testing.T) {
 
 // TestXattrWriteCasUpsert.  Validates basic write of document with xattr,  retrieval of the same doc w/ xattr, update of the doc w/ xattr, retrieval of the doc w/ xattr.
 func TestXattrWriteCasUpsert(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -647,9 +634,6 @@ func TestXattrWriteCasUpsert(t *testing.T) {
 
 // TestXattrWriteCasWithXattrCasCheck.  Validates cas check when using WriteCasWithXattr
 func TestXattrWriteCasWithXattrCasCheck(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -710,8 +694,6 @@ func TestXattrWriteCasWithXattrCasCheck(t *testing.T) {
 }
 
 func TestMultiXattrRoundtrip(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -737,9 +719,6 @@ func TestMultiXattrRoundtrip(t *testing.T) {
 
 // TestWriteCasXATTRRaw.  Validates basic write of document and xattr as raw bytes.
 func TestXattrWriteCasRaw(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -777,13 +756,10 @@ func TestXattrWriteCasRaw(t *testing.T) {
 
 // TestWriteCasTombstoneResurrect.  Verifies writing a new document body and xattr to a logically deleted document (xattr still exists)
 func TestXattrWriteCasTombstoneResurrect(t *testing.T) {
-
 	if UnitTestUrlIsWalrus() {
 		t.Skip("Test requires Couchbase Server bucket when using xattrs")
 	}
 
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -847,11 +823,8 @@ func TestXattrWriteCasTombstoneResurrect(t *testing.T) {
 
 // TestXattrWriteCasTombstoneUpdate.  Validates update of xattr on logically deleted document.
 func TestXattrWriteCasTombstoneUpdate(t *testing.T) {
-
 	t.Skip("Test does not pass with errors: https://gist.github.com/tleyden/d261fe2b92bdaaa6e78f9f1c00fdfd58.  Needs investigation")
 
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -919,8 +892,6 @@ func TestXattrWriteCasTombstoneUpdate(t *testing.T) {
 
 // TestXattrWriteUpdateXattr.  Validates basic write of document with xattr, and retrieval of the same doc w/ xattr.
 func TestXattrWriteUpdateXattr(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1019,8 +990,6 @@ func TestXattrWriteUpdateXattr(t *testing.T) {
 }
 
 func TestWriteUpdateWithXattrUserXattr(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1091,8 +1060,6 @@ func TestWriteUpdateWithXattrUserXattr(t *testing.T) {
 }
 
 func TestWriteUpdateDeleteXattr(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1128,8 +1095,6 @@ func TestWriteUpdateDeleteXattr(t *testing.T) {
 }
 
 func TestWriteUpdateDeleteXattrTombstone(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1156,9 +1121,6 @@ func TestWriteUpdateDeleteXattrTombstone(t *testing.T) {
 
 // TestXattrDeleteDocument.  Delete document that has a system xattr.  System XATTR should be retained and retrievable.
 func TestXattrDeleteDocument(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1197,9 +1159,6 @@ func TestXattrDeleteDocument(t *testing.T) {
 
 // TestXattrDeleteDocumentUpdate.  Delete a document that has a system xattr along with an xattr update.
 func TestXattrDeleteDocumentUpdate(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1302,9 +1261,6 @@ func TestXattrDeleteDocumentAndUpdateXattr(t *testing.T) {
 
 // Validates tombstone of doc + xattr in a matrix of various possible previous states of the document.
 func TestXattrTombstoneDocAndUpdateXattr(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	SetUpTestLogging(t, LevelDebug, KeyCRUD)
 
 	ctx := TestCtx(t)
@@ -1411,9 +1367,6 @@ func TestXattrTombstoneDocAndUpdateXattr(t *testing.T) {
 
 // Validates deletion of doc + xattr in a matrix of various possible previous states of the document.
 func TestXattrDeleteDocAndXattr(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	SetUpTestLogging(t, LevelDebug, KeyCRUD)
 
 	ctx := TestCtx(t)
@@ -1487,11 +1440,9 @@ func TestXattrDeleteDocAndXattr(t *testing.T) {
 // This simulates a race condition by calling deleteWithXattrInternal() and passing a custom
 // callback function
 func TestDeleteWithXattrWithSimulatedRaceResurrect(t *testing.T) {
-
 	if UnitTestUrlIsWalrus() {
 		t.Skip("Test requires CBS in order to use deleteWithXattrInternal callback")
 	}
-	SkipXattrTestsIfNotEnabled(t)
 
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
@@ -1533,9 +1484,6 @@ func TestDeleteWithXattrWithSimulatedRaceResurrect(t *testing.T) {
 
 // TestXattrRetrieveDocumentAndXattr.
 func TestXattrRetrieveDocumentAndXattr(t *testing.T) {
-
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1625,12 +1573,10 @@ func TestXattrRetrieveDocumentAndXattr(t *testing.T) {
 
 // TestXattrMutateDocAndXattr.  Validates mutation of doc + xattr in various possible previous states of the document.
 func TestXattrMutateDocAndXattr(t *testing.T) {
-
 	// Skipping on non-Couchbase until CBG-3392 is fixed
 	if UnitTestUrlIsWalrus() {
 		t.Skip("Test requires Couchbase Server bucket when using xattrs")
 	}
-	SkipXattrTestsIfNotEnabled(t)
 
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
@@ -1750,8 +1696,6 @@ func TestXattrMutateDocAndXattr(t *testing.T) {
 }
 
 func TestGetXattr(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -1834,8 +1778,6 @@ func TestGetXattr(t *testing.T) {
 }
 
 func TestGetXattrAndBody(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
-
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -2244,7 +2186,6 @@ func verifyDocDeletedXattrExists(ctx context.Context, store sgbucket.XattrStore,
 }
 
 func TestUpdateXattrWithDeleteBodyAndIsDelete(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	SetUpTestLogging(t, LevelDebug, KeyCRUD)
 
 	ctx := TestCtx(t)
@@ -2290,7 +2231,6 @@ func TestUpdateXattrWithDeleteBodyAndIsDelete(t *testing.T) {
 }
 
 func TestUserXattrGetWithXattr(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	SetUpTestLogging(t, LevelDebug, KeyCRUD)
 
 	ctx := TestCtx(t)
@@ -2322,7 +2262,6 @@ func TestUserXattrGetWithXattr(t *testing.T) {
 }
 
 func TestUserXattrGetWithXattrNil(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	SetUpTestLogging(t, LevelDebug, KeyCRUD)
 
 	ctx := TestCtx(t)
@@ -2355,7 +2294,6 @@ func TestUserXattrGetWithXattrNil(t *testing.T) {
 }
 
 func TestInsertTombstoneWithXattr(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	SetUpTestLogging(t, LevelDebug, KeyCRUD)
 
 	ctx := TestCtx(t)
@@ -2709,7 +2647,6 @@ func requireXattrNotFoundError(t *testing.T, err error) {
 
 func TestWriteUpdateWithXattrsDocumentTombstone(t *testing.T) {
 	ctx := TestCtx(t)
-	SkipXattrTestsIfNotEnabled(t)
 
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -3243,7 +3180,6 @@ func TestMetadataStoreUpdateAfterMigrationComplete(t *testing.T) {
 // Without the shortcut: callback would observe the actual primary body (because the wrapper
 // would pass nil for previous and primary.WriteUpdateWithXattrs would re-read).
 func TestMetadataStoreWriteUpdateWithXattrsCASShortcut(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -3309,7 +3245,6 @@ func TestMetadataStoreWriteUpdateWithXattrsCASShortcut(t *testing.T) {
 // returned in UpdatedDoc.Xattrs land in primary; xattrs the callback marked for deletion are
 // simply not migrated (which is equivalent to "deleted" since primary never held them).
 func TestMetadataStoreWriteUpdateWithXattrsHonorsXattrsToDelete(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -3364,7 +3299,6 @@ func TestMetadataStoreWriteUpdateWithXattrsHonorsXattrsToDelete(t *testing.T) {
 // that exists only in fallback, the wrapper writes the tombstone to fallback (the only store
 // that ever held the doc). Subsequent reads through the wrapper must surface not-found.
 func TestMetadataStoreWriteUpdateWithXattrsTombstoneFallbackOnly(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -3423,7 +3357,6 @@ func TestMetadataStoreWriteUpdateWithXattrsTombstoneFallbackOnly(t *testing.T) {
 // of TestMetadataStoreUpdateMigratesFromFallback: the wrapper must surface the fallback body and
 // xattrs to the callback and write the result to primary.
 func TestMetadataStoreWriteUpdateWithXattrsMigratesFromFallback(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)
@@ -3584,7 +3517,6 @@ func TestMetadataStoreUpdateConcurrentFallbackWriterShadowed(t *testing.T) {
 // case the tombstone lives in fallback because the doc never made it to primary), and a
 // subsequent WriteUpdateWithXattrs must resurrect it — landing the live doc in primary.
 func TestMetadataStoreWriteUpdateWithXattrsResurrectsAfterFallbackTombstone(t *testing.T) {
-	SkipXattrTestsIfNotEnabled(t)
 	ctx := TestCtx(t)
 	bucket := GetTestBucket(t)
 	defer bucket.Close(ctx)

base/constants.go

@@ -46,10 +46,6 @@ const (
 
 	TestEnvUseExistingBucket = "SG_TEST_USE_EXISTING_BUCKET"
 
-	// Don't use Xattrs by default, but provide the test runner a way to specify Xattr usage
-	TestEnvSyncGatewayUseXattrs = "SG_TEST_USE_XATTRS"
-	TestEnvSyncGatewayTrue      = "True"
-
 	// TestEnvDisableRevCache if set to true will disable the revision cache for tests
 	TestEnvDisableRevCache = "SG_TEST_DISABLE_REV_CACHE"
 

base/util_testing.go

@@ -195,24 +195,6 @@ func rosmarUriFromPath(path string) string {
 	return uri + strings.ReplaceAll(path, `\`, `/`)
 }
 
-// Should Sync Gateway use XATTRS functionality when running unit tests?
-func TestUseXattrs() bool {
-	useXattrs, isSet := os.LookupEnv(TestEnvSyncGatewayUseXattrs)
-	if !isSet {
-		return true
-	}
-
-	val, err := strconv.ParseBool(useXattrs)
-	if err != nil {
-		panic(fmt.Sprintf("unable to parse %q value %q: %v", TestEnvSyncGatewayUseXattrs, useXattrs, err))
-	}
-	if !val {
-		panic(fmt.Sprintf("sync gateway %s requires xattrs to be enabled, remove env var %s=%s", ProductVersion, TestEnvSyncGatewayUseXattrs, useXattrs))
-	}
-
-	return val
-}
-
 // Should Sync Gateway skip TLS verification. Default: DefaultTestTLSSkipVerify
 func TestTLSSkipVerify() bool {
 	tlsSkipVerify, isSet := os.LookupEnv(TestEnvTLSSkipVerify)
@@ -279,22 +261,6 @@ func TestSupportsMobileXDCR() bool {
 	return GTestBucketPool.cluster.isServerEnterprise()
 }
 
-// Should tests try to drop GSI indexes before flushing buckets?
-// See SG #3422
-func TestsShouldDropIndexes() bool {
-
-	// First check if the SG_TEST_USE_XATTRS env variable is set
-	dropIndexes := os.Getenv(TestEnvSyncGatewayDropIndexes)
-
-	if strings.EqualFold(dropIndexes, TestEnvSyncGatewayTrue) {
-		return true
-	}
-
-	// Otherwise fallback to hardcoded default
-	return DefaultDropIndexes
-
-}
-
 // TestsDisableGSI returns true if tests should be forced to avoid any GSI-specific code.
 func TestsDisableGSI() bool {
 	// Disable GSI when running with Walrus
@@ -844,14 +810,6 @@ func requireCasMismatchError(t testing.TB, err error) {
 	require.True(t, IsCasMismatch(err), "Expected error of type IsCasMismatch but got %+v\n", err)
 }
 
-// SkipImportTestsIfNotEnabled skips test that exercise import features
-func SkipImportTestsIfNotEnabled(t *testing.T) {
-
-	if !TestUseXattrs() {
-		t.Skip("XATTR based tests not enabled.  Enable via SG_TEST_USE_XATTRS=true environment variable")
-	}
-}
-
 // RequireAllAssertions ensures that all assertion results were true/ok, and fails the test if any were not.
 // Usage:
 //

db/attachment_compaction_test.go

@@ -610,9 +610,6 @@ func WaitForConditionWithOptions(t testing.TB, successFunc func() bool, maxNumAt
 }
 
 func CreateLegacyAttachmentDoc(t *testing.T, ctx context.Context, db *DatabaseCollectionWithUser, docID string, body []byte, attID string, attBody []byte) string {
-	if !base.TestUseXattrs() {
-		t.Skip("Requires xattrs")
-	}
 
 	attDigest := Sha1DigestKey(attBody)