cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 26936cd
Date Tue, 19 Jan 2016 16:55:13 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f98f98358 -> 26936cdb2


test: Fix Libvirt test so that it works on Windows


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/268b9b31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/268b9b31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/268b9b31

Branch: refs/heads/master
Commit: 268b9b31e7dfbe92f5e81e9b6c4741443294f97e
Parents: 7c83e1b
Author: Wido den Hollander <wido@widodh.nl>
Authored: Mon Dec 14 11:33:47 2015 +0100
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Mon Dec 14 11:33:47 2015 +0100

----------------------------------------------------------------------
 .../kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/268b9b31/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java
b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java
index bb7a3f5..a43b342 100644
--- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java
+++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java
@@ -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() {


Mime
View raw message