Mercurial > hg > release > thermostat-1.4

changeset 1700:c4c7131a6285

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix WebAppTest for release builds (and devel builds). PR 2416 Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-May/013880.html Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-June/014021.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Fri, 29 May 2015 16:32:41 +0200
parents 44d60d1362ee
children 5971a3ba1ca8
files integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java
diffstat 1 files changed, 52 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java	Thu May 28 14:57:42 2015 +0200
+++ b/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java	Fri May 29 16:32:41 2015 +0200
@@ -353,87 +353,72 @@
 
     // PRE: storage started with --permitLocalhostException
     private static void setupMongodbUser() throws Exception {
-        // The actual setup is only required for devel builds. Release builds
-        // won't have users or roles configured, so starting backing storage
-        // (i.e. mongodb) with the --permitLocalhostException option is
-        // sufficient.
+        String mongodbUsername = getMongodbUsername();
+        String mongodbPassword = getMongodbPassword();
 
-        if (isDevelopmentBuild()) {
-            String mongodbUsername = getMongodbUsername();
-            String mongodbPassword = getMongodbPassword();
+        final String HOST = "127.0.0.1";
+        final String PORT = "27518";
 
-            final String HOST = "127.0.0.1";
-            final String PORT = "27518";
+        try {
+            System.out.println("THERMOSTAT_HOME: " + getThermostatHome());
+            System.out.println("USER_THERMOSTAT_HOME: " + getUserThermostatHome());
 
-            try {
-                System.out.println("THERMOSTAT_HOME: " + getThermostatHome());
-                System.out.println("USER_THERMOSTAT_HOME: " + getUserThermostatHome());
+            // start mongod
+            startStorage();
 
-                // start mongod
-                startStorage();
-
-                System.out.println("Started mongod");
-                TimeUnit.SECONDS.sleep(3);
+            System.out.println("Started mongod");
+            TimeUnit.SECONDS.sleep(3);
 
-                ExpectJ mongo = new ExpectJ(TIMEOUT_IN_SECONDS);
-                Spawn mongoSpawn = mongo.spawn("mongo " + HOST + ":" + PORT);
-                mongoSpawn.send("use thermostat\n");
-                mongoSpawn.send("var v = db.version()\n");
-                mongoSpawn.send("var minorMicro = v.substr(v.indexOf('.') + 1)\n");
-                mongoSpawn.send("var minorVersion = minorMicro.substr(0, minorMicro.indexOf('.'))\n");
-                mongoSpawn.send("if ( minorVersion <= 2 ) {");
-                mongoSpawn.send(String.format("db.addUser(\"%s\", \"%s\")", mongodbUsername, mongodbPassword));
-                mongoSpawn.send("} else {");
-                mongoSpawn.send("if ( minorVersion <= 4 ) {");
-                mongoSpawn.send(String.format("db.addUser({ user: \"%s\", pwd: \"%s\", roles: [ \"readWrite\" ] })",
-                        mongodbUsername, mongodbPassword));
-                mongoSpawn.send("} else {");
-                mongoSpawn.send(String.format("db.createUser({ user: \"%s\", pwd: \"%s\", roles: [ \"readWrite\" ] })",
-                        mongodbUsername, mongodbPassword));
-                mongoSpawn.send("}\n");
-                mongoSpawn.send("}\n");
-                mongoSpawn.send("quit()\n");
-                mongoSpawn.expectClose();
+            ExpectJ mongo = new ExpectJ(TIMEOUT_IN_SECONDS);
+            Spawn mongoSpawn = mongo.spawn("mongo " + HOST + ":" + PORT);
+            mongoSpawn.send("use thermostat\n");
+            mongoSpawn.send("var v = db.version()\n");
+            mongoSpawn.send("var minorMicro = v.substr(v.indexOf('.') + 1)\n");
+            mongoSpawn.send("var minorVersion = minorMicro.substr(0, minorMicro.indexOf('.'))\n");
+            mongoSpawn.send("if ( minorVersion <= 2 ) {");
+            mongoSpawn.send(String.format("db.addUser(\"%s\", \"%s\")", mongodbUsername, mongodbPassword));
+            mongoSpawn.send("} else {");
+            mongoSpawn.send("if ( minorVersion <= 4 ) {");
+            mongoSpawn.send(String.format("db.addUser({ user: \"%s\", pwd: \"%s\", roles: [ \"readWrite\" ] })",
+                    mongodbUsername, mongodbPassword));
+            mongoSpawn.send("} else {");
+            mongoSpawn.send(String.format("db.createUser({ user: \"%s\", pwd: \"%s\", roles: [ \"readWrite\" ] })",
+                    mongodbUsername, mongodbPassword));
+            mongoSpawn.send("}\n");
+            mongoSpawn.send("}\n");
+            mongoSpawn.send("quit()\n");
+            mongoSpawn.expectClose();
 
-                mongo = new ExpectJ(TIMEOUT_IN_SECONDS);
-                mongoSpawn = mongo.spawn("mongo " + HOST + ":" + PORT);
-                mongoSpawn.send("use thermostat\n");
-                mongoSpawn.expect("switched to db thermostat");
-                mongoSpawn.send(String.format("db.auth(\"%s\", \"%s\")\n", mongodbUsername, mongodbPassword));
-                mongoSpawn.expect("1");
+            mongo = new ExpectJ(TIMEOUT_IN_SECONDS);
+            mongoSpawn = mongo.spawn("mongo " + HOST + ":" + PORT);
+            mongoSpawn.send("use thermostat\n");
+            mongoSpawn.expect("switched to db thermostat");
+            mongoSpawn.send(String.format("db.auth(\"%s\", \"%s\")\n", mongodbUsername, mongodbPassword));
+            mongoSpawn.expect("1");
 
-                // now insert some fake data and display some information that
-                // might be useful for post-mortem analysis if this test fails
-                mongoSpawn.send("db[\"fake\"].insert({foo:\"bar\", baz: 1})\n");
-                mongoSpawn.send("db[\"fake\"].findOne()\n");
-                mongoSpawn.send("show collections\n");
-                mongoSpawn.send("show users\n");
-                
-            } catch (TimeoutException | IOException e) {
-                throw e;
-            } finally {
-                stopStorage();
-            }
-        } else {
-            System.out.println("Not a development build. Skipping mongodb setup.");
+            // now insert some fake data and display some information that
+            // might be useful for post-mortem analysis if this test fails
+            mongoSpawn.send("db[\"fake\"].insert({foo:\"bar\", baz: 1})\n");
+            mongoSpawn.send("db[\"fake\"].findOne()\n");
+            mongoSpawn.send("show collections\n");
+            mongoSpawn.send("show users\n");
+            
+        } catch (TimeoutException | IOException e) {
+            throw e;
+        } finally {
+            stopStorage();
         }
     }
 
     private static void createWebAuthFile() throws IOException {
-        if (isDevelopmentBuild()) {
-            System.out.println("WRITING auth file: " + getMongodbUsername() + "/" + getMongodbPassword());
-            List<String> lines = new ArrayList<String>();
-            lines.add("storage.username = " + getMongodbUsername());
-            lines.add("storage.password = " + getMongodbPassword());
-            Files.write(new File(THERMOSTAT_WEB_AUTH_FILE).toPath(), lines, StandardCharsets.UTF_8);
-        } else {
-            throw new AssertionError("testing a build !");
-        }
+        System.out.println("WRITING auth file: " + getMongodbUsername() + "/" + getMongodbPassword());
+        List<String> lines = new ArrayList<String>();
+        lines.add("storage.username = " + getMongodbUsername());
+        lines.add("storage.password = " + getMongodbPassword());
+        Files.write(new File(THERMOSTAT_WEB_AUTH_FILE).toPath(), lines, StandardCharsets.UTF_8);
     }
 
     private static String getMongodbUsername() {
-        assertTrue(isDevelopmentBuild());
-        
         // Define this default in order for IDE based runs to require fewer
         // properties to be set.
         String defaultDevUser = "mongodevuser";
@@ -442,8 +427,6 @@
     }
 
     private static String getMongodbPassword() {
-        assertTrue(isDevelopmentBuild());
-        
         // Define this default in order for IDE based runs to require fewer
         // properties to be set.
         String defaultDevPassword = "mongodevpassword";