java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java | 9 +++++----
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit b2d26961e9bad06edf0a05ab338ebe9275312de2
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Jun 24 15:45:24 2010 -0400
junit modification for repo sync
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
index ac763ca..c61bef6 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java
@@ -181,11 +181,12 @@ public class ChannelTest extends BaseTestCaseWithUser {
Channel c = ChannelFactoryTest.createTestChannel(user);
ContentSource cs = new ContentSource();
cs.setLabel("repo_label-" + c.getLabel());
- cs.setSourceUrl("fake url");
- cs.getChannels().add(c);
+ cs.setSourceUrl("fake url");
cs.setType(ChannelFactory.CONTENT_SOURCE_TYPE_YUM);
- //c.getSources().add(cs);
- c = (Channel) TestUtils.saveAndReload(c);
+ cs.setOrg(user.getOrg());
+ cs = (ContentSource) TestUtils.saveAndReload(cs);
+ c.getSources().add(cs);
+ c = (Channel) TestUtils.saveAndReload(c);
assertNotEmpty(c.getSources());
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index 542d67e..4f36783 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -80,7 +80,7 @@ public class RepoSyncTask implements Job {
}
TaskFactory.removeTask(task);
- try {
+ try {
Process p = Runtime.getRuntime().exec(
getSyncCommand(c).toArray(new String[0]));
c.setLastSynced(new Date());
Show replies by date