Skip to content

Commit

Permalink
Run unit tests in parallel
Browse files Browse the repository at this point in the history
- correct several typos
  • Loading branch information
ChunyiLyu committed Jun 3, 2021
1 parent 56babcc commit d83f964
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install-tools:
go get -d k8s.io/code-generator

unit-tests: install-tools generate fmt vet manifests ## Run unit tests
ginkgo -r --randomizeAllSpecs api/ internal/
ginkgo -r --randomizeAllSpecs -p api/ internal/

integration-tests: install-tools generate fmt vet manifests ## Run integration tests
ginkgo -r --randomizeAllSpecs controllers/
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/shovel_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type ShovelSpec struct {
// ShovelStatus defines the observed state of Shovel
type ShovelStatus struct {
// observedGeneration is the most recent successful generation observed for this Shovel. It corresponds to the
// Federation's generation, which is updated on mutation by the API Server.
// Shovel's generation, which is updated on mutation by the API Server.
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
Conditions []Condition `json:"conditions,omitempty"`
}
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_shovels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
type: array
observedGeneration:
description: observedGeneration is the most recent successful generation
observed for this Shovel. It corresponds to the Federation's generation,
observed for this Shovel. It corresponds to the Shovel's generation,
which is updated on mutation by the API Server.
format: int64
type: integer
Expand Down
2 changes: 1 addition & 1 deletion docs/api/rabbitmq.com.ref.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ ShovelStatus defines the observed state of Shovel
[cols="25a,75a", options="header"]
|===
| Field | Description
| *`observedGeneration`* __integer__ | observedGeneration is the most recent successful generation observed for this Shovel. It corresponds to the Federation's generation, which is updated on mutation by the API Server.
| *`observedGeneration`* __integer__ | observedGeneration is the most recent successful generation observed for this Shovel. It corresponds to the Shovel's generation, which is updated on mutation by the API Server.
| *`conditions`* __xref:{anchor_prefix}-github-com-rabbitmq-messaging-topology-operator-api-v1beta1-condition[$$Condition$$]__ |
|===

Expand Down
4 changes: 2 additions & 2 deletions internal/shovel_definition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ var _ = Describe("GenerateShovelDefinition", func() {
BeforeEach(func() {
shovel = &topology.Shovel{
ObjectMeta: metav1.ObjectMeta{
Name: "new-federation",
Name: "new-shovel",
},
Spec: topology.ShovelSpec{
Vhost: "/new-vhost",
Name: "new-federation",
Name: "new-shovel",
},
}
})
Expand Down
4 changes: 2 additions & 2 deletions system_tests/shovel_system_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ var _ = Describe("Shovel", func() {
Expect(shovelInfo.Vhost).To(Equal(shovel.Spec.Vhost))
Expect(shovelInfo.Definition.SourceURI).To(
ConsistOf("amqp://server-test-src0",
"amqp://server-test-src1"))
"amqp://server-test-src1"))
Expect(shovelInfo.Definition.DestinationURI).To(
ConsistOf("amqp://server-test-dest0",
"amqp://server-test-dest1"))
"amqp://server-test-dest1"))
Expect(shovelInfo.Definition.DestinationQueue).To(Equal(shovel.Spec.DestinationQueue))
Expect(shovelInfo.Definition.SourceQueue).To(Equal(shovel.Spec.SourceQueue))
Expect(shovelInfo.Definition.AckMode).To(Equal(shovel.Spec.AckMode))
Expand Down

0 comments on commit d83f964

Please sign in to comment.