[wip] fix bind mount test

Author: karlkfi

test/integration/instance_with_config_file/controls/docker.rb

@@ -44,19 +44,25 @@
       expect(mounts.count).to eq mount_definitions.count
     end
 
-    it "should have the right number of bound disk mounts" do
-      expect(mounts.select { |m| m.Type == "bind" }.count).to eq mount_definitions.count
+    it "should have the right number of bind mounts" do
+      expect(mounts.select { |m| m.Type == "bind" }.count).to eq host_path_volume_definitions.count
     end
 
-    it "should have the right number of hostPath disks on the right mount points" do
-      expect(mounts).to eq "something amazing, who knows?"
-      fs = mounts.select { |m| m.Source.match(/config/) }
-      expect(fs.count).to eq host_path_volume_definitions.count
-      host_path_volume_definitions.each_with_index do |vd, i|
-        mount_definition = mount_definitions.select { |md| md["name"] == vd["name"] }.first
-        expect(fs[i].Destination).to eq mount_definition["mountPath"]
-        expect(fs[i].RW).to eq !mount_definition["readOnly"]
+    it "should have the right number of hostPath volumes on the right mount points" do
+      mounts.each do |mount|
+        # mount destinations have to be unique, so use it to lookup the mount definition
+        mount_def = mount_definitions.select { |md| md["mountPath"] == mount.Destination }.first
+        # use the mount definition name to lookup the volume by name
+        volume_def = host_path_volume_definitions.select { |vd| vd["name"] == mount_def["name"] }.first
+
+        expect(mount).to eq({
+          "Destination" => mount_def["mountPath"],
+          "Mode" => mount_def["readOnly"] ? "ro" : "rw",
+          "Propagation" => "rprivate",
+          "RW" => !mount_def["readOnly"],
+          "Source" => volume_definition["hostPath"]["path"],
+          "Type" => "bind",
+        })
       end
-    end
   end
 end