Skip to content

Commit

Permalink
[#943] fix autotest connection refused - carefull not to reintroduce #…
Browse files Browse the repository at this point in the history
  • Loading branch information
Notalifeform committed Mar 31, 2013
1 parent 677aee4 commit 7e49377
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion framework/pym/play/commands/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def autotest(app, args):
line = soutint.readline().strip()
if line:
print line
if line.find('Go to ') > -1: # This line is written out by the test runner to system.out and is not log file dependent
if line.find('Server is up and running') > -1: # This line is written out by Server.java to system.out and is not log file dependent
soutint.close()
break

Expand Down
5 changes: 4 additions & 1 deletion framework/src/play/server/Server.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ public Server(String[] args) {
Logger.error("Could not bind on port " + httpsPort, e);
Play.fatalServerErrorOccurred();
}

if (Play.mode == Mode.DEV) {
// print this line to STDOUT - not using logger, so auto test runner will not block if logger is misconfigured (see #1222)
System.out.println("~ Server is up and running");
}
}

private String getOpt(String[] args, String arg, String defaultValue) {
Expand Down

0 comments on commit 7e49377

Please sign in to comment.