Skip to content

Commit 79b6f46

Browse files
committed
++ unfocus before merge, fix comments
Signed-off-by: Ivan Mikheykin <ivan.mikheykin@flant.com>
1 parent ee73580 commit 79b6f46

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

test/e2e/vm/hotplug_memory.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"github.com/deckhouse/virtualization/test/e2e/internal/util"
4040
)
4141

42-
var _ = FDescribe("HotplugMemory", func() {
42+
var _ = Describe("HotplugMemory", func() {
4343
var (
4444
f *framework.Framework
4545
t *memoryHotplugTest
@@ -64,7 +64,7 @@ var _ = FDescribe("HotplugMemory", func() {
6464
Expect(err).NotTo(HaveOccurred())
6565

6666
By("Waiting for VM agent to be ready")
67-
util.UntilVMAgentReady(crclient.ObjectKeyFromObject(t.VM), framework.LongTimeout)
67+
util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
6868

6969
By("Checking initial memory size")
7070
err = f.Clients.GenericClient().Get(context.Background(), crclient.ObjectKeyFromObject(t.VM), t.VM)
@@ -87,7 +87,7 @@ var _ = FDescribe("HotplugMemory", func() {
8787

8888
By("Waiting until memory size is applied without restart")
8989
util.UntilVMMigrationSucceeded(crclient.ObjectKeyFromObject(t.VM), framework.MaxTimeout)
90-
util.UntilVMAgentReady(crclient.ObjectKeyFromObject(t.VM), framework.MiddleTimeout)
90+
util.UntilSSHReady(f, t.VM, framework.MiddleTimeout)
9191

9292
By("Checking changed memory size")
9393
err = f.Clients.GenericClient().Get(context.Background(), crclient.ObjectKeyFromObject(t.VM), t.VM)
@@ -127,7 +127,6 @@ func (t *memoryHotplugTest) generateResources(vmName, memSize string) {
127127
vmbuilder.WithCPU(2, ptr.To("10%")),
128128
vmbuilder.WithMemory(memSizeQuantity),
129129
vmbuilder.WithLiveMigrationPolicy(v1alpha2.AlwaysSafeMigrationPolicy),
130-
vmbuilder.WithVirtualMachineClass(object.DefaultVMClass),
131130
vmbuilder.WithProvisioningUserData(object.AlpineCloudInit),
132131
vmbuilder.WithBlockDeviceRefs(
133132
v1alpha2.BlockDeviceSpecRef{

0 commit comments

Comments
 (0)