Author: [email protected]
Date: Fri Oct 21 10:43:34 2011
New Revision: 1555
Log:
[AMDATUCASSANDRA-113] Small textual improvements, 0.2.0 release
Modified:
trunk/test-performance/pom.xml
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java
Modified: trunk/test-performance/pom.xml
==============================================================================
--- trunk/test-performance/pom.xml (original)
+++ trunk/test-performance/pom.xml Fri Oct 21 10:43:34 2011
@@ -9,7 +9,7 @@
</parent>
<groupId>org.amdatu.test</groupId>
<artifactId>org.amdatu.test.performance</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
<packaging>jar</packaging>
<name>Amdatu - Automated performance test</name>
Modified:
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
==============================================================================
---
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
(original)
+++
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
Fri Oct 21 10:43:34 2011
@@ -55,13 +55,12 @@
m_tmpDir.mkdir();
Logger.log("Extracting '" + zipFile.getName() + "' to '" +
m_tmpDir.getAbsolutePath() + "'");
Utils.unzip(zipFile, m_tmpDir);
- addTestBundles();
setPortNumber();
}
// Clean up work directory if necessary
- clean();
-
+ clean();
+
// Start the Amdatu server in a separate process
List<String> command = new ArrayList<String>();
command.add("java");
@@ -79,8 +78,9 @@
Utils.dispatchOutput(m_amdatuProcess);
- // Now wait until the dashboard returns a 200 for a maximum of 3
minutes
- Logger.log("Starting Amdatu, this may take some time...");
+ // Now wait until the dashboard returns a 200 for a maximum of 3
minutes
+ String version = m_context.currentContext.version + " " +
m_context.currentContextName;
+ Logger.log("Starting Amdatu (" + version + "), this may take some
time...");
Thread.sleep(5000); // Wait for 5 seconds before we even start
checking if startup completed
long before = System.currentTimeMillis();
boolean ok = false;
@@ -105,12 +105,13 @@
Logger.log("Amdatu seems up and running!");
long diff = System.currentTimeMillis() - before;
- Logger.log("Amdatu startup completed in " + diff + " ms, running
JMeter test plans");
+ Logger.log("Amdatu startup (" + version + ") completed in " + diff + "
ms, running JMeter test plans");
}
public void stop() throws IOException, InterruptedException {
- // Kill it instantly, no nice shutdown needed
- Logger.log("Stopping Amdatu...");
+ // Kill it instantly, no nice shutdown needed
+ String version = m_context.currentContext.version + " " +
m_context.currentContextName;
+ Logger.log("Stopping Amdatu (" + version + ")...");
if (m_amdatuProcess != null && amdatuProcessRunning()) {
// Send shutdown event
Logger.log("Sending shutdown event");
@@ -121,7 +122,7 @@
m_amdatuProcess.waitFor();
}
- Logger.log("Amdatu shutdown completed");
+ Logger.log("Amdatu (" + version + ") shutdown completed");
}
public void clean() throws IOException {
@@ -148,18 +149,6 @@
FileUtils.deleteDirectory(m_tmpDir);
}
- private void addTestBundles() throws IOException {
- if (m_context.versionDir != null) {
- File[] files = new File(m_context.versionDir).listFiles();
- for (File file : files) {
- if (file.getName().endsWith(".jar")) {
- // This is a test bundle, copy it to the deploy directory
- //FileUtils.copyFile(file, new File(new File(m_tmpDir,
"deploy"), file.getName()));
- }
- }
- }
- }
-
private void setPortNumber() throws IOException {
if (m_context.port != -1) {
File felixHttpConfig = new File(m_tmpDir,
"deploy/org.apache.felix.http.cfg");
Modified:
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java
==============================================================================
---
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java
(original)
+++
trunk/test-performance/src/main/java/org/amdatu/test/performance/runtest/JMeterRunner.java
Fri Oct 21 10:43:34 2011
@@ -97,8 +97,9 @@
cmd += c + " ";
}
cmd = cmd.substring(0, cmd.length()-1);
- Logger.log("------------------------------------------------");
- Logger.log("Executing JMeter plan '" + jmeterPlan.getName() +
"'" + (rampUp ? " (ramp-up mode)" : ""));
+ Logger.log("------------------------------------------------");
+ String version = m_context.currentContext.version + " " +
m_context.currentContextName;
+ Logger.log("Executing JMeter plan '" + jmeterPlan.getName() +
"' on " + version + (rampUp ? " (ramp-up mode)" : ""));
Logger.log("");
Logger.log("Executing '" + cmd + "'");
ProcessBuilder processBuilder = new ProcessBuilder(command);
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
