You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/19 17:55:13 UTC
[1/2] git commit: updated refs/heads/master to 26936cd
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 <wi...@widodh.nl>
Authored: Mon Dec 14 11:33:47 2015 +0100
Committer: Wido den Hollander <wi...@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() {
[2/2] git commit: updated refs/heads/master to 26936cd
Posted by re...@apache.org.
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 <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26936cdb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26936cdb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26936cdb
Branch: refs/heads/master
Commit: 26936cdb2b4a0f77cd223eab62347d89803f6693
Parents: f98f983 268b9b3
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Jan 19 17:54:44 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Jan 19 17:54:44 2016 +0100
----------------------------------------------------------------------
.../kvm/resource/wrapper/LibvirtUtilitiesHelperTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------