etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1242 from wido/fix-kvm-libvirt-test 

test: Fix Libvirt test so that it works on WindowsThis test failed on Windows, using the File.separator it should run fine on Windows.

* pr/1242:
  test: Fix Libvirt test so that it works on Windows

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2016-01-19 17:54:44 +01:00
parent f98f983583 268b9b31e7
commit 26936cdb2b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java
View File

@ -16,6 +16,7 @@
// under the License.
package com.cloud.hypervisor.kvm.resource.wrapper;
import java.io.File;
import java.util.UUID;
import com.cloud.utils.script.Script;
@ -37,8 +38,8 @@ public class LibvirtUtilitiesHelperTest extends TestCase {
* Hardcoded paths are not what we want in the longer run
*/
assertEquals("/root/.ssh", helper.retrieveSshKeysPath());
assertEquals("/root/.ssh/id_rsa.pub.cloud", helper.retrieveSshPubKeyPath());
assertEquals("/root/.ssh/id_rsa.cloud", helper.retrieveSshPrvKeyPath());
assertEquals("/root/.ssh" + File.separator + "id_rsa.pub.cloud", helper.retrieveSshPubKeyPath());
assertEquals("/root/.ssh" + File.separator + "id_rsa.cloud", helper.retrieveSshPrvKeyPath());
}
public void testBashScriptPath() {