java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9a5c77d082b4c7eeb1d36fc4e1cdd40dcc3000ae
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Dec 3 14:10:11 2012 +0100
KickstartDataTest should no longer fail
Failing tests were caused by 1c7490e39d859179573e2c735e82bc3acb8e3f05, using
buildCobblerFileName instead of getCobblerFileName where getCobblerFileName would return
null.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index 178288a..66755a7 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -121,7 +121,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
org.cobbler.Profile p = org.cobbler.Profile.create(
CobblerXMLRPCHelper.getConnection("test"),
CobblerCommand.makeCobblerName(k), d);
- p.setKickstart(k.getCobblerFileName());
+ p.setKickstart(k.buildCobblerFileName());
k.setCobblerId(p.getUid());
}
@@ -175,7 +175,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k = (KickstartData) reload(k);
KickstartFactory.saveKickstartData(k);
- String contents = FileUtils.readStringFromFile(k.getCobblerFileName());
+ String contents = FileUtils.readStringFromFile(k.buildCobblerFileName());
assertTrue(contents.indexOf("\\$") > 0);
assertTrue(contents.indexOf("\\$" +
KickstartUrlHelper.COBBLER_MEDIA_VARIABLE) < 0);
@@ -285,7 +285,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
assertNull(lookupById(user.getOrg(), ksd.getId()));
assertNull(lookupByLabel(ksd.getLabel()));
- String path = ksd.getCobblerFileName();
+ String path = ksd.buildCobblerFileName();
File f = new File(path);
assertFalse(f.exists());
Show replies by date