speedup tests (#21)

* speedup tests

* use ForceShort for tests

Author: roblaszczak

.github/workflows/master.yml

@@ -5,7 +5,4 @@ on:
       - master
 jobs:
   ci:
-    uses: ThreeDotsLabs/watermill/.github/workflows/tests.yml@master
-    with:
-      stress-tests: true
-      runs-on: ubuntu-latest-8core
+    uses: ThreeDotsLabs/watermill/.github/workflows/tests.yml@master

.github/workflows/pr.yml

@@ -6,5 +6,3 @@ on:
 jobs:
   ci:
     uses: ThreeDotsLabs/watermill/.github/workflows/tests.yml@master
-    with:
-      runs-on: ubuntu-latest-16core

Makefile

@@ -4,7 +4,7 @@ up:
 	docker compose up -d
 
 test:
-	go test ./... -timeout=20m
+	go test ./...
 
 test_v:
 	go test -v ./...
@@ -13,7 +13,7 @@ test_short:
 	go test ./... -short
 
 test_race:
-	go test ./... -short -race -timeout=30m
+	go test ./... -short -race
 
 test_stress:
 	STRESS_TEST_COUNT=3 go test -tags=stress -timeout=45m ./...

sns/pubsub_test.go

@@ -23,20 +23,27 @@ import (
 )
 
 func TestPublishSubscribe(t *testing.T) {
+	t.Parallel()
+
 	tests.TestPubSub(
 		t,
 		tests.Features{
 			ConsumerGroups:      true,
 			ExactlyOnceDelivery: false,
 			GuaranteedOrder:     false,
 			Persistent:          true,
+			// Currently none of emulators are stable enough to
+			// handle all tests, see: https://github.com/localstack/localstack/issues/2074
+			ForceShort: true,
 		},
 		createPubSub,
 		createPubSubWithConsumerGroup,
 	)
 }
 
 func TestPubSub_arn_topic_resolver(t *testing.T) {
+	t.Parallel()
+
 	tests.TestPublishSubscribe(
 		t,
 		tests.TestContext{
@@ -50,6 +57,9 @@ func TestPubSub_arn_topic_resolver(t *testing.T) {
 				GenerateTopicFunc: func(tctx tests.TestContext) string {
 					return fmt.Sprintf("arn:aws:sns:us-west-2:000000000000:%s", tctx.TestID)
 				},
+				// Currently none of emulators are stable enough to
+				// handle all tests, see: https://github.com/localstack/localstack/issues/2074
+				ForceShort: true,
 			},
 		},
 		func(t *testing.T) (message.Publisher, message.Subscriber) {
@@ -90,6 +100,8 @@ func TestPubSub_arn_topic_resolver(t *testing.T) {
 }
 
 func TestPublisher_CreateTopic_is_idempotent(t *testing.T) {
+	t.Parallel()
+
 	pub, _ := createPubSub(t)
 
 	topicName := watermill.NewUUID()
@@ -104,6 +116,8 @@ func TestPublisher_CreateTopic_is_idempotent(t *testing.T) {
 }
 
 func TestSubscriber_SubscribeInitialize_is_idempotent(t *testing.T) {
+	t.Parallel()
+
 	_, sub := createPubSub(t)
 
 	topicName := watermill.NewUUID()

sqs/pubsub_stress_test.go

@@ -0,0 +1,18 @@
+//go:build stress
+// +build stress
+
+package sqs
+
+func TestPubSub_stress(t *testing.T) {
+	tests.TestPubSubStressTest(
+		t,
+		tests.Features{
+			ConsumerGroups:      false,
+			ExactlyOnceDelivery: false,
+			GuaranteedOrder:     true,
+			Persistent:          true,
+		},
+		createPubSub,
+		createPubSubWithConsumerGroup,
+	)
+}

sqs/pubsub_test.go

@@ -21,34 +21,27 @@ import (
 )
 
 func TestPubSub(t *testing.T) {
-	tests.TestPubSub(
-		t,
-		tests.Features{
-			ConsumerGroups:      false,
-			ExactlyOnceDelivery: false,
-			GuaranteedOrder:     true,
-			Persistent:          true,
-		},
-		createPubSub,
-		createPubSubWithConsumerGroup,
-	)
-}
+	t.Parallel()
 
-func TestPubSub_stress(t *testing.T) {
-	tests.TestPubSubStressTest(
+	tests.TestPubSub(
 		t,
 		tests.Features{
 			ConsumerGroups:      false,
 			ExactlyOnceDelivery: false,
 			GuaranteedOrder:     true,
 			Persistent:          true,
+			// Currently none of emulators are stable enough to
+			// handle all tests, see: https://github.com/localstack/localstack/issues/2074
+			ForceShort: true,
 		},
 		createPubSub,
 		createPubSubWithConsumerGroup,
 	)
 }
 
 func TestPublishSubscribe_with_GenerateQueueUrlResolver(t *testing.T) {
+	t.Parallel()
+
 	tests.TestPublishSubscribe(
 		t,
 		tests.TestContext{
@@ -59,6 +52,9 @@ func TestPublishSubscribe_with_GenerateQueueUrlResolver(t *testing.T) {
 				GuaranteedOrder:                     true,
 				GuaranteedOrderWithSingleSubscriber: true,
 				Persistent:                          true,
+				// Currently none of emulators are stable enough to
+				// handle all tests, see: https://github.com/localstack/localstack/issues/2074
+				ForceShort: true,
 			},
 		},
 		func(t *testing.T) (message.Publisher, message.Subscriber) {
@@ -112,6 +108,8 @@ func TestPublishSubscribe_with_GenerateQueueUrlResolver(t *testing.T) {
 }
 
 func TestPublishSubscribe_with_TransparentUrlResolver(t *testing.T) {
+	t.Parallel()
+
 	tests.TestPublishSubscribe(
 		t,
 		tests.TestContext{
@@ -125,6 +123,9 @@ func TestPublishSubscribe_with_TransparentUrlResolver(t *testing.T) {
 				GenerateTopicFunc: func(tctx tests.TestContext) string {
 					return fmt.Sprintf("http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/%s", tctx.TestID)
 				},
+				// Currently none of emulators are stable enough to
+				// handle all tests, see: https://github.com/localstack/localstack/issues/2074
+				ForceShort: true,
 			},
 		},
 		func(t *testing.T) (message.Publisher, message.Subscriber) {
@@ -175,6 +176,8 @@ func TestPublishSubscribe_with_TransparentUrlResolver(t *testing.T) {
 }
 
 func TestPublishSubscribe_batching(t *testing.T) {
+	t.Parallel()
+
 	tests.TestPublishSubscribe(
 		t,
 		tests.TestContext{
@@ -185,6 +188,9 @@ func TestPublishSubscribe_batching(t *testing.T) {
 				GuaranteedOrder:                     true,
 				GuaranteedOrderWithSingleSubscriber: true,
 				Persistent:                          true,
+				// Currently none of emulators are stable enough to
+				// handle all tests, see: https://github.com/localstack/localstack/issues/2074
+				ForceShort: true,
 			},
 		},
 		func(t *testing.T) (message.Publisher, message.Subscriber) {
@@ -231,6 +237,8 @@ func TestPublishSubscribe_batching(t *testing.T) {
 }
 
 func TestPublishSubscribe_creating_queue_with_different_settings_should_be_idempotent(t *testing.T) {
+	t.Parallel()
+
 	logger := watermill.NewStdLogger(false, false)
 
 	sub1, err := sqs.NewSubscriber(sqs.SubscriberConfig{
@@ -264,6 +272,8 @@ func TestPublishSubscribe_creating_queue_with_different_settings_should_be_idemp
 }
 
 func TestPublisher_GetOrCreateQueueUrl_is_idempotent(t *testing.T) {
+	t.Parallel()
+
 	pub, _ := createPubSub(t)
 
 	topicName := watermill.NewUUID()
@@ -280,6 +290,8 @@ func TestPublisher_GetOrCreateQueueUrl_is_idempotent(t *testing.T) {
 }
 
 func TestSubscriber_doesnt_hang_when_queue_doesnt_exist(t *testing.T) {
+	t.Parallel()
+
 	cfg := newAwsConfig(t)
 
 	_, sub := createPubSubWithConfig(
@@ -315,6 +327,8 @@ func TestSubscriber_doesnt_hang_when_queue_doesnt_exist(t *testing.T) {
 }
 
 func TestPublisher_do_not_create_queue(t *testing.T) {
+	t.Parallel()
+
 	cfg := newAwsConfig(t)
 
 	pub, _ := createPubSubWithConfig(