Merge pull request #30 from Mmduh-483/fix-unit-test

Fix unit test failure and order of execution
Mellanox · Nov 18, 2020 · e71dd54 · e71dd54
2 parents 8ef414a + aa68073
commit e71dd54
Showing 1 changed file with 47 additions and 44 deletions.
diff --git a/pkg/resources/server_test.go b/pkg/resources/server_test.go
@@ -440,6 +440,50 @@ var _ = Describe("resourceServer tests", func() {
 			rsc.AssertExpectations(testCallsAssertionReporter)
 		})
 	})
+	Context("UpdateDevices", func() {
+		It("should receive signal of updating resource", func() {
+			rs := &resourceServer{
+				updateResource: make(chan bool),
+				rdmaHcaMax:     10,
+			}
+
+			go func() { rs.UpdateDevices(fakeDeviceList) }()
+			Expect(<-rs.updateResource).To(BeTrue())
+			Expect(len(rs.deviceSpec)).To(Equal(1))
+			Expect(len(rs.devs)).To(Equal(10))
+		})
+		It("resources not updated", func() {
+			rs := &resourceServer{
+				updateResource: make(chan bool),
+				rdmaHcaMax:     10,
+			}
+
+			var emptyDevicesList []types.PciNetDevice
+			rs.UpdateDevices(emptyDevicesList)
+			Expect(len(rs.deviceSpec)).To(Equal(0))
+			Expect(len(rs.devs)).To(Equal(0))
+		})
+	})
+	Context("devicesChanged", func() {
+		It("device is present and did not change", func() {
+			deviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
+			newDeviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
+			changed := devicesChanged(deviceList, newDeviceList)
+			Expect(changed).To(BeFalse())
+		})
+		It("device changed - num of devices in deviceList", func() {
+			deviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
+			newDeviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}, {HostPath: "/foo/bar2"}}
+			changed := devicesChanged(deviceList, newDeviceList)
+			Expect(changed).To(BeTrue())
+		})
+		It("device changed - mounts changed for one of the devices in the deviceList", func() {
+			deviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
+			newDeviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar2"}}
+			changed := devicesChanged(deviceList, newDeviceList)
+			Expect(changed).To(BeTrue())
+		})
+	})
 	DescribeTable("registering with Kubelet",
 		func(shouldRunServer, shouldEnablePluginWatch, shouldServerFail, shouldFail bool) {
 			fs := &utils.FakeFilesystem{}
@@ -577,6 +621,9 @@ var _ = Describe("resourceServer tests", func() {
 				err = rs.Restart()
 				Expect(err).NotTo(HaveOccurred())
 
+				err = registrationServer.registerPlugin()
+				Expect(err).NotTo(HaveOccurred())
+
 				go func() {
 					stop := <-rs.stop
 					Expect(stop).To(BeTrue())
@@ -614,50 +661,6 @@ var _ = Describe("resourceServer tests", func() {
 				Expect(err).NotTo(HaveOccurred())
 			})
 		})
-		Context("UpdateDevices", func() {
-			It("should receive signal of updating resource", func() {
-				rs := &resourceServer{
-					updateResource: make(chan bool),
-					rdmaHcaMax:     10,
-				}
-
-				go func() { rs.UpdateDevices(fakeDeviceList) }()
-				Expect(<-rs.updateResource).To(BeTrue())
-				Expect(len(rs.deviceSpec)).To(Equal(1))
-				Expect(len(rs.devs)).To(Equal(10))
-			})
-			It("resources not updated", func() {
-				rs := &resourceServer{
-					updateResource: make(chan bool),
-					rdmaHcaMax:     10,
-				}
-
-				var emptyDevicesList []types.PciNetDevice
-				rs.UpdateDevices(emptyDevicesList)
-				Expect(len(rs.deviceSpec)).To(Equal(0))
-				Expect(len(rs.devs)).To(Equal(0))
-			})
-		})
-		Context("devicesChanged", func() {
-			It("device is present and did not change", func() {
-				deviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
-				newDeviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
-				changed := devicesChanged(deviceList, newDeviceList)
-				Expect(changed).To(BeFalse())
-			})
-			It("device changed - num of devices in deviceList", func() {
-				deviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
-				newDeviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}, {HostPath: "/foo/bar2"}}
-				changed := devicesChanged(deviceList, newDeviceList)
-				Expect(changed).To(BeTrue())
-			})
-			It("device changed - mounts changed for one of the devices in the deviceList", func() {
-				deviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar"}}
-				newDeviceList := []*pluginapi.DeviceSpec{{HostPath: "/foo/bar2"}}
-				changed := devicesChanged(deviceList, newDeviceList)
-				Expect(changed).To(BeTrue())
-			})
-		})
 	})
 
 	DescribeTable("allocating",