Changes to 'refs/tags/spacewalk-java-1.8.41-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.41-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-11 09:47 +0000
Tagging package [spacewalk-java] version [1.8.41-1] in directory [java/].
Changes since spacewalk-java-1.8.40-1:
Tomas Lestach (2):
adding javadoc to public RhnPostMockStrutsTestCase method
Automatic commit of package [spacewalk-java] release [1.8.41-1].
---
java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 4 ++++
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
---
12 years, 1 month
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 4 ++++
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit d2b3484b16b675364874c43ad66730951d8ee6b8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:47:28 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.41-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 75b0361..39d32cc 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.40
+Version: 1.8.41
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.41-1
+- adding javadoc to public RhnPostMockStrutsTestCase method
+ (tlestach(a)redhat.com)
+
* Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.40-1
- fix BaseKickstartEditTestCase tests (tlestach(a)redhat.com)
- fix VirtualGuestsActionTest (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e9d4fdf..87f21ca 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.40-1 java/
+1.8.41-1 java/
commit 2d29845b46b330ba393d96a9aa94eb5da871b3e5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:41:30 2012 +0200
adding javadoc to public RhnPostMockStrutsTestCase method
diff --git a/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java
index bd17b33..3c4d475 100644
--- a/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java
+++ b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java
@@ -23,6 +23,10 @@ import servletunit.HttpServletRequestSimulator;
*/
public class RhnPostMockStrutsTestCase extends RhnMockStrutsTestCase {
+ /**
+ * override the setupUp method
+ * {@inheritDoc}
+ */
public void setUp() throws Exception {
super.setUp();
request.setMethod(HttpServletRequestSimulator.POST);
12 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.8.40-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.40-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-11 09:27 +0000
Tagging package [spacewalk-java] version [1.8.40-1] in directory [java/].
Changes since osad-5.10.44-1:
Jan Pazdziora (1):
787225 - the Log Size actually checks Log Size Growth.
Milan Zazrivec (1):
810313 - new option to list snapshot details
Tomas Lestach (36):
statements cannot end with ";" for Oracle
create RhnPostMockStrutsTestCase for testing POST methods
fix CloneConfirmActionTest
fix CreateUserActionTest
fix KickstartPartitionActionTest
fix PreservationListEditActionTest
fix SystemDetailsEditActionTest
fix CertificateConfigActionTest
fix CryptoKeyCreateActionTest
fix KickstartIpRangeActionTest
fix RestartActionTest
fix GeneralConfigActionTest
fix BaseSetOperateOnDiffActionTest
fix CompletedActionsSetupActionTest
fix CryptoKeyDeleteActionTest
fix KickstartAdvancedOptionsActionTest
fix errata/test/ErrataConfirmActionTest
fix systems/test/ErrataConfirmActionTest
fix TreeActionTest
fix TreeActionTest.testCreateRefresh
fix TreeActionTest - need to set ks tree installtype
fix OrgSoftwareSubscriptionsActionTest
fix FailedActionsSetupActionTest
fix ErrataActionTest
fix OrgCreateActionTest
fix RegisteredSetupActionTest
fix ChannelFilesImportTest
fix SystemEntitlementsSubmitActionTest
fix OrgSystemSubscriptionsActionTest
fix KickstartEditPackagesTest
fix BootstrapConfigActionTest
fix PendingActionsSetupActionTest
fix MethodActionTest
fix VirtualGuestsActionTest
fix BaseKickstartEditTestCase tests
Automatic commit of package [spacewalk-java] release [1.8.40-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 6 -
java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java | 8 +
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 4
java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 30 +++++++
java/spacewalk-java.spec | 42 +++++++++-
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/data/rhn_command.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql | 3
utils/sw-system-snapshot.sgml | 10 ++
utils/systemSnapshot.py | 41 +++++++--
56 files changed, 224 insertions(+), 110 deletions(-)
---
12 years, 1 month
36 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 6 -
java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java | 8 +
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 4
java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 4
java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 30 +++++++
java/spacewalk-java.spec | 42 +++++++++-
rel-eng/packages/spacewalk-java | 2
36 files changed, 144 insertions(+), 68 deletions(-)
New commits:
commit 4780a8086810dce0b4cf84c3110582ba1639d6fe
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:27:55 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.40-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a1d852b..75b0361 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.39
+Version: 1.8.40
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,46 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.40-1
+- fix BaseKickstartEditTestCase tests (tlestach(a)redhat.com)
+- fix VirtualGuestsActionTest (tlestach(a)redhat.com)
+- fix MethodActionTest (tlestach(a)redhat.com)
+- fix PendingActionsSetupActionTest (tlestach(a)redhat.com)
+- fix BootstrapConfigActionTest (tlestach(a)redhat.com)
+- fix KickstartEditPackagesTest (tlestach(a)redhat.com)
+- fix OrgSystemSubscriptionsActionTest (tlestach(a)redhat.com)
+- fix SystemEntitlementsSubmitActionTest (tlestach(a)redhat.com)
+- fix ChannelFilesImportTest (tlestach(a)redhat.com)
+- fix RegisteredSetupActionTest (tlestach(a)redhat.com)
+- fix OrgCreateActionTest (tlestach(a)redhat.com)
+- fix ErrataActionTest (tlestach(a)redhat.com)
+- fix FailedActionsSetupActionTest (tlestach(a)redhat.com)
+- fix OrgSoftwareSubscriptionsActionTest (tlestach(a)redhat.com)
+- fix TreeActionTest - need to set ks tree installtype (tlestach(a)redhat.com)
+- fix TreeActionTest.testCreateRefresh (tlestach(a)redhat.com)
+- fix TreeActionTest (tlestach(a)redhat.com)
+- fix systems/test/ErrataConfirmActionTest (tlestach(a)redhat.com)
+- fix errata/test/ErrataConfirmActionTest (tlestach(a)redhat.com)
+- fix KickstartAdvancedOptionsActionTest (tlestach(a)redhat.com)
+- fix CryptoKeyDeleteActionTest (tlestach(a)redhat.com)
+- fix CompletedActionsSetupActionTest (tlestach(a)redhat.com)
+- fix BaseSetOperateOnDiffActionTest (tlestach(a)redhat.com)
+- fix GeneralConfigActionTest (tlestach(a)redhat.com)
+- fix RestartActionTest (tlestach(a)redhat.com)
+- fix KickstartIpRangeActionTest (tlestach(a)redhat.com)
+- fix CryptoKeyCreateActionTest (tlestach(a)redhat.com)
+- fix CertificateConfigActionTest (tlestach(a)redhat.com)
+- fix SystemDetailsEditActionTest (tlestach(a)redhat.com)
+- fix PreservationListEditActionTest (tlestach(a)redhat.com)
+- fix KickstartPartitionActionTest (tlestach(a)redhat.com)
+- fix CreateUserActionTest (tlestach(a)redhat.com)
+- fix CloneConfirmActionTest (tlestach(a)redhat.com)
+- create RhnPostMockStrutsTestCase for testing POST methods
+ (tlestach(a)redhat.com)
+- statements cannot end with ";" for Oracle (tlestach(a)redhat.com)
+- 787225 - the Log Size actually checks Log Size Growth.
+ (jpazdziora(a)redhat.com)
+
* Tue Apr 10 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.39-1
- fix ServerConfigHandlerTest revision comparism (tlestach(a)redhat.com)
- fix ServerConfigHandlerTest.createRevision (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 11a2815..e9d4fdf 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.39-1 java/
+1.8.40-1 java/
commit aa8b4bcf7e0e385573ddb480aefa36303cb06825
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:26:26 2012 +0200
fix BaseKickstartEditTestCase tests
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java
index c8b8a48..1cf60f9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java
@@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
@@ -29,7 +29,7 @@ import java.util.List;
* KickstartDetailsEditTest
* @version $Rev: 1 $
*/
-public class BaseKickstartEditTestCase extends RhnMockStrutsTestCase {
+public class BaseKickstartEditTestCase extends RhnPostMockStrutsTestCase {
protected KickstartData ksdata;
commit 16b7733ba59559cc4e135e87f18ea1997d788f10
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:25:29 2012 +0200
fix VirtualGuestsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java
index 8897eb4..80bf3e9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java
@@ -29,7 +29,7 @@ import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.taglibs.ListDisplayTag;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.ServerTestUtils;
import com.redhat.rhn.testing.TestUtils;
@@ -44,7 +44,7 @@ import java.util.Map;
* VirtualGuestsListActionTest
* @version $Rev$
*/
-public class VirtualGuestsActionTest extends RhnMockStrutsTestCase {
+public class VirtualGuestsActionTest extends RhnPostMockStrutsTestCase {
private RhnSet submitVirtualGuestsForm(String dispatch, Map requestParams)
throws Exception {
commit 8bf75589018b55f319d37c4ba7d18096a7c4f802
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:24:26 2012 +0200
fix MethodActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java
index 69bab53..6cc4942 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java
@@ -24,11 +24,11 @@ import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.ModifyMethodCommand;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
-public class MethodActionTest extends RhnMockStrutsTestCase {
+public class MethodActionTest extends RhnPostMockStrutsTestCase {
private String expectedName = "Expected Method Name";
commit fe4ea1c5192eae52ba86d45c643e63b5bd5069b0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:23:22 2012 +0200
fix PendingActionsSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java
index bd60ba4..6bf094f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java
@@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
/**
* PendingActionsSetupActionTest
* @version $Rev$
*/
-public class PendingActionsSetupActionTest extends RhnMockStrutsTestCase {
+public class PendingActionsSetupActionTest extends RhnPostMockStrutsTestCase {
commit 2d70e914f53b0875486fc86971296aacc9eb06a9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:22:32 2012 +0200
fix BootstrapConfigActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java
index b5bae12..aea657d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java
@@ -19,7 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.action.satellite.BootstrapConfigAction;
import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -27,7 +27,7 @@ import org.apache.struts.action.DynaActionForm;
* BootstrapConfigActionTest
* @version $Rev: 1 $
*/
-public class BootstrapConfigActionTest extends RhnMockStrutsTestCase {
+public class BootstrapConfigActionTest extends RhnPostMockStrutsTestCase {
/**
* {@inheritDoc}
commit ebbc0972405157ef525a821ccea0836da41ace80
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:21:40 2012 +0200
fix KickstartEditPackagesTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java
index 028f774..b5cde5b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java
@@ -15,9 +15,9 @@
package com.redhat.rhn.frontend.action.kickstart.test;
import com.redhat.rhn.domain.kickstart.KickstartData;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
-public class KickstartEditPackagesTest extends RhnMockStrutsTestCase {
+public class KickstartEditPackagesTest extends RhnPostMockStrutsTestCase {
public void testDisplay() throws Exception {
KickstartData k = KickstartTestHelper.createTestKickStart(user);
commit 8e56af7c5fda9180efb72eb598ea72e470c1cfcd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:18:54 2012 +0200
fix OrgSystemSubscriptionsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java
index 6ff80c0..45421e5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java
@@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.multiorg.test;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -25,7 +25,7 @@ import org.apache.struts.action.DynaActionForm;
* OrgSubscriptionsActionTest
* @version $Rev: 1 $
*/
-public class OrgSystemSubscriptionsActionTest extends RhnMockStrutsTestCase {
+public class OrgSystemSubscriptionsActionTest extends RhnPostMockStrutsTestCase {
public void testExecute() throws Exception {
user.getOrg().addRole(RoleFactory.SAT_ADMIN);
commit 0e4037cf3e2865a8b6012b620fe433d1889be5dc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:18:02 2012 +0200
fix SystemEntitlementsSubmitActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
index a4db320..6336ded 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
@@ -28,7 +28,7 @@ import com.redhat.rhn.frontend.action.systems.entitlements.SystemEntitlementsSub
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.system.SystemManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.ServerGroupTestUtils;
import com.redhat.rhn.testing.ServerTestUtils;
import com.redhat.rhn.testing.TestUtils;
@@ -40,7 +40,7 @@ import java.util.Iterator;
* SystemEntitlementSubmitActionToast
* @version $Rev$
*/
-public class SystemEntitlementsSubmitActionTest extends RhnMockStrutsTestCase {
+public class SystemEntitlementsSubmitActionTest extends RhnPostMockStrutsTestCase {
private static final String UPDATE =
"system_entitlements.setToUpdateEntitled";
commit 5f3622950dc1d54b6d4705b8c31e1ec057fa8c30
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:16:27 2012 +0200
fix ChannelFilesImportTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java
index dc04fe9..2023558 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java
@@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.configuration.test;
import com.redhat.rhn.domain.config.ConfigChannel;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.testing.ConfigTestUtils;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.UserTestUtils;
/**
@@ -25,7 +25,7 @@ import com.redhat.rhn.testing.UserTestUtils;
* ChannelFilesImportTest
* @version $Rev$
*/
-public class ChannelFilesImportTest extends RhnMockStrutsTestCase {
+public class ChannelFilesImportTest extends RhnPostMockStrutsTestCase {
public void testExecuteNoFiles() throws Exception {
UserTestUtils.addUserRole(user, RoleFactory.CONFIG_ADMIN);
commit ed04c02a3974fca2f0b69267c72c02cd79e79aa7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:14:46 2012 +0200
fix RegisteredSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java
index c148234..cd8b51c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java
@@ -26,13 +26,13 @@ import com.redhat.rhn.domain.server.test.ServerGroupTest;
import com.redhat.rhn.frontend.action.systems.RegisteredSetupAction;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.system.SystemManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/**
* RegisteredSetupActionTest
* @version $Rev$
*/
-public class RegisteredSetupActionTest extends RhnMockStrutsTestCase {
+public class RegisteredSetupActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception {
super.setUp();
commit abaeeb0bc932cbca6e1b0084bf1844425b317b8f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:06:41 2012 +0200
fix OrgCreateActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java
index c54f509..54af9e4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java
@@ -15,14 +15,14 @@
package com.redhat.rhn.frontend.action.multiorg.test;
import com.redhat.rhn.domain.role.RoleFactory;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
/**
* OrgCreateActionTest - test org create
* @version $Rev: 119601 $
*/
-public class OrgCreateActionTest extends RhnMockStrutsTestCase {
+public class OrgCreateActionTest extends RhnPostMockStrutsTestCase {
public void testExecuteSubmit() throws Exception {
user.getOrg().addRole(RoleFactory.SAT_ADMIN);
commit ea639d39c1e63faa6550c51974e546e24906e58b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 11:04:44 2012 +0200
fix ErrataActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
index 09cfd6f..ed4e9be 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
@@ -30,13 +30,13 @@ import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.errata.cache.ErrataCacheManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/**
* ErrataActionTest
* @version $Rev$
*/
-public class ErrataActionTest extends RhnMockStrutsTestCase {
+public class ErrataActionTest extends RhnPostMockStrutsTestCase {
public void testEmptySelection() throws Exception {
String pathInfo = "/systems/details/ErrataList";
setRequestPathInfo(pathInfo);
commit f1ac6e32bb7abe7c105992ad9734d79530e75eb2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 10:55:47 2012 +0200
fix FailedActionsSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java
index 9477688..6db5f5e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java
@@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
/**
* FailedActionsSetupActionTest
* @version $Rev$
*/
-public class FailedActionsSetupActionTest extends RhnMockStrutsTestCase {
+public class FailedActionsSetupActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception {
commit 459c2a575f5feb2fc6d362e163b8d3256b86154d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 10:52:22 2012 +0200
fix OrgSoftwareSubscriptionsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java
index 59d4a5a..dcf370f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java
@@ -22,7 +22,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import java.util.HashMap;
@@ -34,7 +34,7 @@ import java.util.Map;
* OrgSoftwareSubscriptionsActionTest
* @version $Rev: 1 $
*/
-public class OrgSoftwareSubscriptionsActionTest extends RhnMockStrutsTestCase {
+public class OrgSoftwareSubscriptionsActionTest extends RhnPostMockStrutsTestCase {
public void testExecute() throws Exception {
user.getOrg().addRole(RoleFactory.SAT_ADMIN);
commit 2120690474f83ec0d7ff8cf28d23cee75a7e51f6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 11 10:49:32 2012 +0200
fix TreeActionTest - need to set ks tree installtype
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java
index 8be218d..f210e54 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.test.ChannelFactoryTest;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
+import com.redhat.rhn.domain.kickstart.KickstartInstallType;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
import com.redhat.rhn.domain.kickstart.test.KickstartableTreeTest;
@@ -208,6 +209,9 @@ public class TreeActionTest extends RhnPostMockStrutsTestCase {
addRequestParameter(TreeCreateAction.CHANNEL_ID,
c.getId().toString());
addRequestParameter(TreeCreateAction.LABEL, newLabel);
+ KickstartInstallType installtype = (KickstartInstallType)
+ TestUtils.lookupFromCacheById(1L, "KickstartInstallType.findById");
+ addRequestParameter(TreeCreateAction.INSTALL_TYPE, installtype.getLabel());
actionPerform();
verifyNoActionErrors();
return newLabel;
commit e2b5f0a4e8da16604249b06c17c0c2535e8139bf
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:10:11 2012 +0200
fix TreeActionTest.testCreateRefresh
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
index 705dcfd..0def9ab 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
@@ -500,11 +500,11 @@ public class PackageManagerTest extends BaseTestCaseWithUser {
Map params = new HashMap();
params.put("pkg_id", kickstartPkg.getId());
params.put("capability_id", kickstartCapability.getId());
- params.put("sense_id", "8");
+ params.put("sense_id", 8);
m.executeUpdate(params);
// Repeast for another sense:
- params.put("sense_id", "268435464");
+ params.put("sense_id", 268435464);
m.executeUpdate(params);
}
commit 2a3fd8c6bd9d7cb9992e90fec5490db4517c2d3f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:06:46 2012 +0200
fix TreeActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java
index efddab8..8be218d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java
@@ -30,7 +30,7 @@ import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest;
import com.redhat.rhn.testing.ChannelTestUtils;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
@@ -43,7 +43,7 @@ import java.util.List;
* TreeCreateTest
* @version $Rev: 1 $
*/
-public class TreeActionTest extends RhnMockStrutsTestCase {
+public class TreeActionTest extends RhnPostMockStrutsTestCase {
public void testCreateNonSubmit() throws Exception {
UserTestUtils.addUserRole(user, RoleFactory.CONFIG_ADMIN);
commit 1a05b62356a79f95f575bfa9892add4d9b638517
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:05:47 2012 +0200
fix systems/test/ErrataConfirmActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java
index fcc3073..82d1f91 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java
@@ -28,7 +28,7 @@ import com.redhat.rhn.frontend.context.Context;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import java.util.TimeZone;
@@ -36,7 +36,7 @@ import java.util.TimeZone;
* ErrataConfirmActionTest
* @version $Rev$
*/
-public class ErrataConfirmActionTest extends RhnMockStrutsTestCase {
+public class ErrataConfirmActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception {
super.setUp();
commit d6632e802f1a99e6d23c506e3d13684e1c7572c8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:05:00 2012 +0200
fix errata/test/ErrataConfirmActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java
index 3554be4..7bd0196 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java
@@ -23,14 +23,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/**
* ErrataConfirmActionTest - test that ErrataConfirmAction correctly
* schedules the Actions associated with the Errata
* @version $Rev$
*/
-public class ErrataConfirmActionTest extends RhnMockStrutsTestCase {
+public class ErrataConfirmActionTest extends RhnPostMockStrutsTestCase {
public void testExecute() throws Exception {
setRequestPathInfo("/errata/details/ErrataConfirmSubmit");
commit 91e66992a400aeb2922d4cd9f75a52d0aa073103
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:03:44 2012 +0200
fix KickstartAdvancedOptionsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java
index 9144edc..30d8402 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java
@@ -18,14 +18,14 @@ import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
import com.redhat.rhn.frontend.action.kickstart.KickstartAdvancedOptionsAction;
import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
/**
* KickstartAdvancedOptionsTest
* @version $Rev: 1 $
*/
-public class KickstartAdvancedOptionsActionTest extends RhnMockStrutsTestCase {
+public class KickstartAdvancedOptionsActionTest extends RhnPostMockStrutsTestCase {
protected KickstartData ksdata;
protected KickstartData ksdataOptions;
commit 8cf9a650729a6f37b92892fa09f3f3eba6ae78ee
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:02:54 2012 +0200
fix CryptoKeyDeleteActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java
index 9a4308b..79b92e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java
@@ -20,13 +20,13 @@ import com.redhat.rhn.frontend.action.keys.CryptoKeyCreateAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.kickstart.crypto.CreateCryptoKeyCommand;
import com.redhat.rhn.manager.kickstart.crypto.test.CryptoKeyCommandTest;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/**
* CryptoKeyDeleteActionTest
* @version $Rev: 1 $
*/
-public class CryptoKeyDeleteActionTest extends RhnMockStrutsTestCase {
+public class CryptoKeyDeleteActionTest extends RhnPostMockStrutsTestCase {
private CreateCryptoKeyCommand cmd;
commit e146c2b2e94b5b77b446b526db203b2c5f1291f4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:02:00 2012 +0200
fix CompletedActionsSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java
index 7b1f534..71545f1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java
@@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
/**
* CompletedActionsSetupActionTest
* @version $Rev$
*/
-public class CompletedActionsSetupActionTest extends RhnMockStrutsTestCase {
+public class CompletedActionsSetupActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception {
super.setUp();
commit 7399a59917ebb1a0446b686b53035935b06d89fc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:01:04 2012 +0200
fix BaseSetOperateOnDiffActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java
index c0d7a1e..0808198 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java
@@ -24,14 +24,14 @@ import com.redhat.rhn.frontend.action.kickstart.ActivationKeysSubmitAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.taglibs.ListDisplayTag;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
/**
* BaseSetOperateOnDiffActionTest
* @version $Rev$
*/
-public class BaseSetOperateOnDiffActionTest extends RhnMockStrutsTestCase {
+public class BaseSetOperateOnDiffActionTest extends RhnPostMockStrutsTestCase {
// We use activation keys <-> to kickstart profile to test this.
// I wanted to make sure we had a specific test class that was tied
commit f97e630360c97968f49e75bba24cd0e8a403f9c6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 17:00:10 2012 +0200
fix GeneralConfigActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java
index 07e3d31..296dcb7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java
@@ -19,7 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.action.satellite.GeneralConfigAction;
import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -31,7 +31,7 @@ import java.util.Map;
* GeneralConfigActionTest
* @version $Rev: 1 $
*/
-public class GeneralConfigActionTest extends RhnMockStrutsTestCase {
+public class GeneralConfigActionTest extends RhnPostMockStrutsTestCase {
private static final String TEST_CONFIG_BOOLEAN =
ConfigDefaults.WEB_IS_MONITORING_BACKEND;
commit 78d9017adf49b15944230ac203037505de37fa0d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:58:46 2012 +0200
fix RestartActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java
index 3c6c0bd..41a1091 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java
@@ -18,7 +18,7 @@ import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.action.satellite.RestartAction;
import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -26,7 +26,7 @@ import org.apache.struts.action.DynaActionForm;
* RestartActionTest
* @version $Rev: 1 $
*/
-public class RestartActionTest extends RhnMockStrutsTestCase {
+public class RestartActionTest extends RhnPostMockStrutsTestCase {
/**
* {@inheritDoc}
commit 9a94d3ecd55dc68194eb88c7bd2e8226e8cbb748
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:57:36 2012 +0200
fix KickstartIpRangeActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java
index 7258cfd..ae8f6fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java
@@ -23,7 +23,7 @@ import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeAction;
import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeDeleteAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.kickstart.IpAddress;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import java.util.Date;
@@ -32,7 +32,7 @@ import java.util.Date;
* KickstartIpRangeActionTest
* @version $Rev: 1 $
*/
-public class KickstartIpRangeActionTest extends RhnMockStrutsTestCase {
+public class KickstartIpRangeActionTest extends RhnPostMockStrutsTestCase {
protected KickstartData ksdata;
protected KickstartIpRange ip1;
commit 53f173d06ac00c41721bf059b5d76b2bb81d9950
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:45:53 2012 +0200
fix CryptoKeyCreateActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java
index 821534b..ccdfa4c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java
@@ -19,14 +19,14 @@ import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.kickstart.crypto.test.CryptoTest;
import com.redhat.rhn.frontend.action.keys.CryptoKeyCreateAction;
import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
/**
* CryptoKeyCreateActionTest
* @version $Rev: 1 $
*/
-public class CryptoKeyCreateActionTest extends RhnMockStrutsTestCase {
+public class CryptoKeyCreateActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception {
TestUtils.disableLocalizationLogging();
commit e26fe4db823ea45e38e4de21ced0bfbb94690302
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:44:19 2012 +0200
fix CertificateConfigActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java
index 82b3ba0..59a75ae 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java
@@ -18,7 +18,7 @@ import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.action.satellite.CertificateConfigAction;
import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import org.apache.struts.action.DynaActionForm;
@@ -27,7 +27,7 @@ import org.apache.struts.action.DynaActionForm;
* CertificateConfigActionTest
* @version $Rev: 1 $
*/
-public class CertificateConfigActionTest extends RhnMockStrutsTestCase {
+public class CertificateConfigActionTest extends RhnPostMockStrutsTestCase {
@Override
public void setUp() throws Exception {
commit 62ef5130770c69a4b721ed9be4b1f65aa8d9385f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:43:01 2012 +0200
fix SystemDetailsEditActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
index f5b4e54..ec0c640 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
@@ -24,7 +24,7 @@ import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.testing.ChannelTestUtils;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.ServerTestUtils;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
@@ -38,7 +38,7 @@ import java.util.List;
* SystemDetailsEditActionTest
* @version $Rev$
*/
-public class SystemDetailsEditActionTest extends RhnMockStrutsTestCase {
+public class SystemDetailsEditActionTest extends RhnPostMockStrutsTestCase {
protected Server s;
commit 39b258711c14860478ed507afc620975cb8330ec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:40:40 2012 +0200
fix PreservationListEditActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java
index 511b8df..9606dca 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java
@@ -20,7 +20,7 @@ import com.redhat.rhn.domain.common.test.FileListTest;
import com.redhat.rhn.frontend.action.systems.provisioning.BasePreservationListEditAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
@@ -28,7 +28,7 @@ import com.redhat.rhn.testing.UserTestUtils;
* PreservationListEditActionTest
* @version $Rev: 1 $
*/
-public class PreservationListEditActionTest extends RhnMockStrutsTestCase {
+public class PreservationListEditActionTest extends RhnPostMockStrutsTestCase {
public void testEditExecute() throws Exception {
UserTestUtils.addProvisioning(user.getOrg());
commit b23ca87dccf91d1a762c866970d90aaafd9df3f1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:37:40 2012 +0200
fix KickstartPartitionActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java
index 104507c..9c5bfa9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java
@@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
import com.redhat.rhn.frontend.action.kickstart.KickstartPartitionEditAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import org.apache.struts.action.DynaActionForm;
@@ -28,7 +28,7 @@ import org.apache.struts.action.DynaActionForm;
* KickstartPreActionTest
* @version $Rev: 1 $
*/
-public class KickstartPartitionActionTest extends RhnMockStrutsTestCase {
+public class KickstartPartitionActionTest extends RhnPostMockStrutsTestCase {
private KickstartData ksdata;
@Override
commit 0cf98f16512048aaf38b9762fcf92cdd8a3e63e2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:31:04 2012 +0200
fix CreateUserActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java
index f2b4d7a..84a4a3d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java
@@ -18,7 +18,7 @@ import com.redhat.rhn.common.messaging.MessageQueue;
import com.redhat.rhn.frontend.action.user.CreateUserAction;
import com.redhat.rhn.frontend.action.user.UserActionHelper;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.webapp.RhnServletListener;
@@ -27,7 +27,7 @@ import com.redhat.rhn.webapp.RhnServletListener;
*
* @version $Rev: 1427 $
*/
-public class CreateUserActionTest extends RhnMockStrutsTestCase {
+public class CreateUserActionTest extends RhnPostMockStrutsTestCase {
private static RhnServletListener rl;
commit c764a6950f38227289c41d49fca2a63b7a3f399e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:27:19 2012 +0200
fix CloneConfirmActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java
index 43f4f78..e6ff304 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java
@@ -27,7 +27,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import java.util.ArrayList;
import java.util.Iterator;
@@ -37,7 +37,7 @@ import java.util.List;
* CloneConfirmActionTest
* @version $Rev$
*/
-public class CloneConfirmActionTest extends RhnMockStrutsTestCase {
+public class CloneConfirmActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception {
super.setUp();
commit 9e2676465a8f20f382b5c50ebe613a6f89183031
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:26:23 2012 +0200
create RhnPostMockStrutsTestCase for testing POST methods
diff --git a/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java
new file mode 100644
index 0000000..bd17b33
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.testing;
+
+import servletunit.HttpServletRequestSimulator;
+
+
+/**
+ * RhnPostMockStrutsTestCase
+ * @version $Rev$
+ */
+public class RhnPostMockStrutsTestCase extends RhnMockStrutsTestCase {
+
+ public void setUp() throws Exception {
+ super.setUp();
+ request.setMethod(HttpServletRequestSimulator.POST);
+ }
+}
commit aa6744f6909c412a1004e1f00cad078a2880d2ff
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 16:03:31 2012 +0200
statements cannot end with ";" for Oracle
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
index 5935e21..d3ff272 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
@@ -382,6 +382,8 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
" id number" +
" constraint adv_datasource_pk primary key" +
")");
+ stmt.execute("insert into adv_datasource(foobar, id) " +
+ "values ('Blarg', 1)");
}
else {
c.rollback();
@@ -393,9 +395,9 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
" id numeric" +
" constraint adv_datasource_pk primary key" +
");");
+ stmt.execute("insert into adv_datasource(foobar, id) " +
+ "values ('Blarg', 1);");
}
- stmt.execute("insert into adv_datasource(foobar, id) " +
- "values ('Blarg', 1);");
c.commit();
}
finally {
12 years, 1 month
utils/sw-system-snapshot.sgml utils/systemSnapshot.py
by Milan Zazrivec
utils/sw-system-snapshot.sgml | 10 ++++++++++
utils/systemSnapshot.py | 41 +++++++++++++++++++++++++++++++++--------
2 files changed, 43 insertions(+), 8 deletions(-)
New commits:
commit aac94c5f5e777eb03f8dc43495ff520dace600f0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Apr 10 17:16:43 2012 +0200
810313 - new option to list snapshot details
diff --git a/utils/sw-system-snapshot.sgml b/utils/sw-system-snapshot.sgml
index 805e2ff..b31d922 100644
--- a/utils/sw-system-snapshot.sgml
+++ b/utils/sw-system-snapshot.sgml
@@ -38,6 +38,10 @@ List or delete system snapshots from the management server.
<arg>--list</arg>
</cmdsynopsis>
<cmdsynopsis>
+ <arg>-L</arg>
+ <arg>--long-list</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
<arg>-d</arg>
<arg>--delete</arg>
</cmdsynopsis>
@@ -107,6 +111,12 @@ List or delete system snapshots from the management server.
</listitem>
</varlistentry>
<varlistentry>
+ <term>-L, --long-list</term>
+ <listitem>
+ <para>List details about system snapshots that meet the criteria provided.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>-d, --delete</term>
<listitem>
<para>Delete system snapshots that meet the criteria provided.</para>
diff --git a/utils/systemSnapshot.py b/utils/systemSnapshot.py
index 5b2cf78..849cf8c 100755
--- a/utils/systemSnapshot.py
+++ b/utils/systemSnapshot.py
@@ -37,6 +37,8 @@ options_table = [
help="Delete snapshots."),
Option("-l", "--list", action="count",
help="List snapshot summary."),
+ Option("-L", "--long-list", action="count",
+ help="Display comprehensive snapshot list."),
Option("-a", "--all", action="count",
help="Include all snapshots based on criteria provided."),
Option("--start-date", action="store",
@@ -127,7 +129,8 @@ def deleteAllBetweenDates(sessionKey, startDate, endDate):
if options.list:
listSnapshots(system.get('id'), snapshots)
-
+ elif options.long_list:
+ listSnapshotsLong(system.get('id'), snapshots)
else:
client.system.provisioning.snapshot.deleteSnapshots(sessionKey, \
{"startDate":startDate, "endDate":endDate})
@@ -150,7 +153,8 @@ def deleteAllAfterDate(sessionKey, startDate):
if options.list:
listSnapshots(system.get('id'), snapshots)
-
+ elif options.long_list:
+ listSnapshotsLong(system.get('id'), snapshots)
else:
client.system.provisioning.snapshot.deleteSnapshots(sessionKey, \
{"startDate":startDate})
@@ -172,7 +176,8 @@ def deleteAll(sessionKey):
if options.list:
listSnapshots(system.get('id'), snapshots)
-
+ elif options.long_list:
+ listSnapshotsLong(system.get('id'), snapshots)
else:
client.system.provisioning.snapshot.deleteSnapshots(sessionKey, \
{})
@@ -196,7 +201,8 @@ def deleteBySystemBetweenDates(sessionKey, systemIds, startDate, endDate):
if options.list:
listSnapshots(systemId, snapshots)
-
+ elif options.long_list:
+ listSnapshotsLong(systemId, snapshots)
else:
client.system.provisioning.snapshot.deleteSnapshots( \
sessionKey, systemId, \
@@ -224,7 +230,8 @@ def deleteBySystemAfterDate(sessionKey, systemIds, startDate):
if options.list:
listSnapshots(systemId, snapshots)
-
+ elif options.long_list:
+ listSnapshotsLong(systemId, snapshots)
else:
client.system.provisioning.snapshot.deleteSnapshots( \
sessionKey, systemId, {"startDate":startDate})
@@ -250,7 +257,8 @@ def deleteBySystem(sessionKey, systemIds):
if options.list:
listSnapshots(systemId, snapshots)
-
+ elif options.long_list:
+ listSnapshotsLong(systemId, snapshots)
else:
client.system.provisioning.snapshot.deleteSnapshots( \
sessionKey, systemId, {})
@@ -305,13 +313,26 @@ def listSnapshots(systemId, snapshots):
print "systemId: %d, snapshots: %d, oldest: %s, newest: %s" \
% (systemId, len(snapshots), oldest, newest)
+
+def listSnapshotsLong(systemId, snapshots):
+ """
+ List to stdout the comprehensive summaries of snapshots for the system provided.
+ """
+ for snapshot in snapshots:
+ print "systemId: %d, snapshotId: %d, created: %s, reason: %s" % \
+ (systemId, \
+ snapshot['id'], \
+ datetime(*(strptime(snapshot['created'].value, "%Y%m%dT%H:%M:%S")[0:6])), \
+ snapshot['reason'])
+
+
def processCommandLine():
if not options.satellite:
options.satellite = os.uname()[1]
- if not options.delete and not options.list:
- sys.stderr.write("Must include a command options (--list, --delete)\n")
+ if not options.delete and not options.list and not options.long_list:
+ sys.stderr.write("Must include a command options (--list, --long-list, --delete)\n")
sys.exit(1)
if not options.all and not options.system_id and not options.snapshot_id:
@@ -326,6 +347,10 @@ def processCommandLine():
sys.stderr.write("--end-date must be used with --start-date.\n")
sys.exit(1)
+ if options.list and options.long_list:
+ sys.stderr.write("-l (--list) and -L (--long-list) are mutually exclusive.\n")
+ sys.exit(1)
+
# convert the start / end dates to a format that usable by the xmlrpc api
if options.start_date:
options.start_date = datetime(*(strptime(options.start_date, "%Y%m%d%H%M%S")[0:6]))
12 years, 1 month
java/code schema/spacewalk
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 4 ++--
schema/spacewalk/common/data/rhn_command.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql | 3 +++
18 files changed, 37 insertions(+), 34 deletions(-)
New commits:
commit ab041f279e3b44cacdc09338e4701110acfa9ee4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 16:13:41 2012 +0200
787225 - the Log Size actually checks Log Size Growth.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
index c519149..422cdd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
@@ -3324,9 +3324,9 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>Log Pattern Match</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
- <target>Log Size</target></trans-unit>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
+ <target>Log Size Growth</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
<target>LongLegs</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
index 063f9ad..4013924 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>Log Pattern Match</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>Log-Größe</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
index 51ad1b2..019fca4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
@@ -3344,8 +3344,8 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
</trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
</trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
index 2a2f5c6..0b2e73c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>Coincidencias de patrones de registro</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>Tamaño del registro</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
index 0021c00..07da9e0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>Correspondances de modèles de journaux</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>Taille de journal</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
index 59536d5..d9c389a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>લોગ ભાત જોડણીઓ</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>લોગ માપ</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
index 40927c8..02ab229 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>लॉग प्रारूप मेल</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>लॉग आकार</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
index ec6a763..32040ab 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>Corrispondenze del Pattern di log</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>Misura del Log</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
index b7285fe..4de7427 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>ログパターン一致</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>ログサイズ</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
index d1782a7..c7e2436 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>로그 패턴 일치</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>로그 크기</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
index 1edbf86..8ad736d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>ਲਾਗ ਪੈਟਰਨ ਮੇਲ</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>ਲਾਗ ਅਕਾਰ</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
index c450046..1569946 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>Ocorrências do Modelo de Registro</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>Tamanho do Registro</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
index 5a4ddd5..ff7c2da 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>Соответствие шаблона журналирования</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>Размер журнала</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
index e45aaf2..09fecb3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>பதிவு வடிவ ஒப்பீடு</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>பதிவு அளவு</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
index 8d41c27..b7cd1ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>日志特征匹配</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>日志大小</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
index 606cbcc..46ecafe 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
@@ -3324,8 +3324,8 @@
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
<target>紀錄模式吻合</target></trans-unit>
- <trans-unit id="Log Size">
- <source>Log Size</source>
+ <trans-unit id="Log Size Growth">
+ <source>Log Size Growth</source>
<target>紀錄檔大小</target></trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
diff --git a/schema/spacewalk/common/data/rhn_command.sql b/schema/spacewalk/common/data/rhn_command.sql
index c6706bd..8647420 100644
--- a/schema/spacewalk/common/data/rhn_command.sql
+++ b/schema/spacewalk/common/data/rhn_command.sql
@@ -264,7 +264,7 @@ command_class,enabled,for_host_probe,last_update_user,last_update_date,system_re
insert into rhn_command(recid,name,description,group_name,allowed_in_suite,
command_class,enabled,for_host_probe,last_update_user,last_update_date,system_requirements,version_support,help_url)
values (
-106,'check_log_size','Log Size','logagent','1','LogAgent::Size','1','0','system',current_timestamp,'npunix',NULL,'/help/userguides/user_guide_v2/Output/LogAgentCheck.html#LogSize');
+106,'check_log_size','Log Size Growth','logagent','1','LogAgent::Size','1','0','system',current_timestamp,'npunix',NULL,'/help/userguides/user_guide_v2/Output/LogAgentCheck.html#LogSize');
insert into rhn_command(recid,name,description,group_name,allowed_in_suite,
command_class,enabled,for_host_probe,last_update_user,last_update_date,system_requirements,version_support,help_url)
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql
new file mode 100644
index 0000000..c83b437
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql
@@ -0,0 +1,3 @@
+
+update rhn_command set description = 'Log Size Growth' where name = 'check_log_size' ;
+
12 years, 1 month
Changes to 'refs/tags/osad-5.10.44-1'
by Milan Zazrivec
Tag 'osad-5.10.44-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2012-04-10 13:41 +0000
Tagging package [osad] version [5.10.44-1] in directory [client/tools/osad/].
Changes since spacewalk-java-1.8.39-1:
Milan Zazrivec (2):
716064 - prevent 'notifying clients' starvation
Automatic commit of package [osad] release [5.10.44-1].
---
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/osa_dispatcher.py | 4 ++--
rel-eng/packages/osad | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
12 years, 1 month
client/tools rel-eng/packages
by Milan Zazrivec
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit de0cc1d652e30fba0e9688eb1b916d540249a494
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Apr 10 15:41:08 2012 +0200
Automatic commit of package [osad] release [5.10.44-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index fae875a..6028805 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.43
+Version: 5.10.44
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -278,6 +278,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Tue Apr 10 2012 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.44-1
+- 716064 - prevent 'notifying clients' starvation
+
* Mon Apr 09 2012 Stephen Herr <sherr(a)redhat.com> 5.10.43-1
- 810908 - Make osa-dispatcher use the hostname in the rhn.conf if present
(sherr(a)redhat.com)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index b92821a..f212306 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.43-1 client/tools/osad/
+5.10.44-1 client/tools/osad/
12 years, 1 month
client/tools
by Milan Zazrivec
client/tools/osad/src/osa_dispatcher.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c55818af8d22109b7e9d1310d694cae1561e0e41
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Apr 10 15:34:16 2012 +0200
716064 - prevent 'notifying clients' starvation
Previously, in a single loop pass, we only notified clients if there
was no more data to read from clients:
if (there_is_client_data_to_read):
read_the_client_data()
else:
push_scheduled_actions_to_clients()
This schema would allow for starvation of the else branch. All you
needed for the starvation was a data to be read from clients, since
it would always be prefered to the event pushing.
We want to prevent the starvation using the following logic:
if (there_is_client_data_to_read):
read_the_client_data()
if (the_client_socket_is_write_ready):
push_scheduled_actions_to_clients()
diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py
index 2071672..a5a1e6c 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -187,7 +187,7 @@ class Runner(jabber_lib.Runner):
client.ping_clients(need_pinging)
npi = self._next_poll_interval
- rfds, wfds, efds = select.select([client, self._tcp_server], [], [], npi)
+ rfds, wfds, efds = select.select([client, self._tcp_server], [client], [], npi)
# Reset the next poll interval
npi = self._next_poll_interval = self._poll_interval
if client in rfds:
@@ -198,7 +198,7 @@ class Runner(jabber_lib.Runner):
# we were tickled
self._tcp_server.handle_request()
npi = self._tcp_server.get_next_poll_interval() or self._poll_interval
- if not rfds:
+ if wfds:
# Timeout
log_debug(5,"Notifying jabber nodes")
self._tcp_server.notify_jabber_nodes()
12 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.8.39-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.39-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-10 12:57 +0000
Tagging package [spacewalk-java] version [1.8.39-1] in directory [java/].
Changes since oracle-xe-selinux-10.2.0.24-1:
Tomas Lestach (18):
fix ProvisionVirtualizationWizardActionTest.testStepOne
removing unnecessary else statement
removing unnecessary casts
refactor how PackageEvr gets stored
fix CobblerCommandTest
fix AdvDataSourceTest suite part
run oracle specific tests only with oracle DB
fix SessionCancelActionTest
fix TraceBackEventTest
fix ActivationKeyTest.testDuplicateKeyCreation
check whether it's a trusted org before accessing its attributes
fix org.trusts.getDetails API
fix PG lookup_transaction_package stored procedure
fix ProfileManagerTest
tests - set user's org to the channel created by him
fix ServerConfigHandlerTest.createRevision
fix ServerConfigHandlerTest revision comparism
Automatic commit of package [spacewalk-java] release [1.8.39-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 184 +++++-----
java/code/src/com/redhat/rhn/domain/action/ActionFactory.java | 2
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 2
java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 2
java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 8
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 34 +
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java | 2
java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java | 2
java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java | 2
java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 2
java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java | 13
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java | 3
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java | 2
java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java | 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 7
java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 4
java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java | 4
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java | 4
java/code/src/com/redhat/rhn/manager/org/OrgManager.java | 20 -
java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java | 5
java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 2
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 2
java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 3
java/spacewalk-java.spec | 21 +
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/postgres/procs/lookup_transaction_package.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql | 80 ++++
32 files changed, 295 insertions(+), 138 deletions(-)
---
12 years, 1 month