java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 1 + java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 10 ++++------ java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit efcb99288904f7b02ca689075200560e6ebb528a Author: Tomas Lestach tlestach@redhat.com Date: Mon Apr 16 17:13:07 2012 +0200
fix ErrataHandlerTest
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java index 2c7ef0d..515f52b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java @@ -444,7 +444,7 @@ public class ErrataHandlerTest extends BaseHandlerTestCase { Map errataInfo = new HashMap();
- String advisoryName = RandomStringUtils.random(37); + String advisoryName = RandomStringUtils.random(101); populateErrataInfo(errataInfo); errataInfo.put("advisory_name", advisoryName);
commit 9670d422b2f707f51c4a22e21a16a070d3b867b3 Author: Tomas Lestach tlestach@redhat.com Date: Mon Apr 16 17:12:04 2012 +0200
812053 - fix the ErrataHandler.clone method
return cloned errata list (not an empty array) rename confusing inheritAllPackages -> inheritPackages
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java index d2b6bc9..37c2072 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java @@ -879,7 +879,7 @@ public class ErrataHandler extends BaseHandler {
private Object[] clone(String sessionKey, String channelLabel, - List<String> advisoryNames, boolean inheritAllPackages) { + List<String> advisoryNames, boolean inheritPackages) { User loggedInUser = getLoggedInUser(sessionKey);
Logger log = Logger.getLogger(ErrataFactory.class); @@ -892,7 +892,7 @@ public class ErrataHandler extends BaseHandler { }
//if calling cloneAsOriginal, do additional checks to verify a clone - if (!inheritAllPackages) { + if (inheritPackages) { if (!channel.isCloned()) { throw new InvalidChannelException("Cloned channel expected: " + channel.getLabel()); @@ -918,8 +918,6 @@ public class ErrataHandler extends BaseHandler {
List<Errata> errataToClone = new ArrayList<Errata>(); List<Errata> errataToPublish = new ArrayList<Errata>(); - List<Errata> toReturn = new ArrayList<Errata>(); - //We loop through once, making sure all the errata exist for (String advisory : advisoryNames) { Errata toClone = lookupErrata(advisory, loggedInUser.getOrg()); @@ -946,12 +944,12 @@ public class ErrataHandler extends BaseHandler {
//Now publish them all to the channel in a single shot List<Errata> published = ErrataFactory.publishToChannel(errataToPublish, channel, - loggedInUser, inheritAllPackages); + loggedInUser, inheritPackages); for (Errata e : published) { ErrataFactory.save(e); }
- return toReturn.toArray(); + return published.toArray(); }
commit 8ba2cd0ffb48d19281c45ad5894a5c766d2df3f9 Author: Tomas Lestach tlestach@redhat.com Date: Mon Apr 16 17:04:14 2012 +0200
create a test erratum with keyword
diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java index c6e4b30..63b1e9d 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java @@ -304,6 +304,7 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser { e.setAdvisoryName(name); e.setAdvisoryRel(new Long(2)); e.setLocallyModified(Boolean.FALSE); + e.addKeyword("keyword"); Package testPackage = PackageTest.createTestPackage();
ErrataFile ef;
spacewalk-commits@lists.fedorahosted.org