Commit ac47fbd9 authored by Aitor Cedres's avatar Aitor Cedres
Browse files

Use BeforeSuit instead of its Synchronized version

The intention of SynchronizedBeforeSuite is to initialise singletons
e.g. a database. It then provides a block to initialise clients, using
the data from the previous block if needed. Since we don't have a
singleton, we don't need to use this.
parent b0d98dc5
Showing with 2 additions and 15 deletions
+2 -15
......@@ -30,7 +30,7 @@ var (
specifiedStorageClassName = "persistent-test"
)
var _ = SynchronizedBeforeSuite(func() []byte {
var _ = BeforeSuite(func() {
scheme := runtime.NewScheme()
Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
......@@ -38,7 +38,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
restConfig, err := createRestConfig()
Expect(err).NotTo(HaveOccurred())
rmqClusterClient, err := client.New(restConfig, client.Options{Scheme: scheme})
rmqClusterClient, err = client.New(restConfig, client.Options{Scheme: scheme})
Expect(err).NotTo(HaveOccurred())
clientSet, err = createClientSet()
......@@ -71,17 +71,4 @@ var _ = SynchronizedBeforeSuite(func() []byte {
return output
}, 10, 1).Should(ContainSubstring("1/1"))
return nil
}, func(data []byte) {
scheme := runtime.NewScheme()
Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
restConfig, err := createRestConfig()
Expect(err).NotTo(HaveOccurred())
rmqClusterClient, err = client.New(restConfig, client.Options{Scheme: scheme})
Expect(err).NotTo(HaveOccurred())
})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment