Author: rvs
Date: Wed Sep 7 17:15:02 2011
New Revision: 1166271
URL: http://svn.apache.org/viewvc?rev=1166271&view=rev
Log:
BIGTOP-83. Advanced checks in checkRemoval need to be moved out
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesSingleNode.groovy
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy?rev=1166271&r1=1166270&r2=1166271&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
(original)
+++
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
Wed Sep 7 17:15:02 2011
@@ -412,17 +412,16 @@ class PackageTestCommon {
}
}
- public void checkRemoval() {
- checkComplimentary32bitInstall();
-
+ public void checkDaemonStart() {
// We need to start service for one more time to make sure that package
// removal would succeed even when services are still running
pkg.getServices().each { name, svc ->
checkThat("can not start service $name",
svc.start(), equalTo(0));
}
- sleep(3001); // TODO FIXME: CDH-2816 should address the timing of daemons
start.
+ }
+ public void checkRemoval() {
checkThat("package $name failed to be removed",
pkg.remove(), equalTo(0));
checkThat("package $name is NOT expected to remain installed after
removal",
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesSingleNode.groovy
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesSingleNode.groovy?rev=1166271&r1=1166270&r2=1166271&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesSingleNode.groovy
(original)
+++
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesSingleNode.groovy
Wed Sep 7 17:15:02 2011
@@ -57,4 +57,13 @@ class TestPackagesSingleNode extends Tes
void testPackageServices() {
checkServices(getMap(golden.services));
}
-}
+
+ @RunStage(level=1)
+ @Test
+ void testPackageRemove() {
+ checkComplimentary32bitInstall();
+ checkDaemonStart();
+ sleep(3001); // TODO FIXME: CDH-2816 should address the timing of daemons
start.
+ checkRemoval();
+ }
+}
\ No newline at end of file
