Merge pull request #2605 from michaelhixson/fix-lapis-db-environment

Repair lapis database tests by providing the correct db hostname

frameworks/Lua/lapis/config.moon

@@ -12,4 +12,4 @@ config {"production", "development"}, ->
     database "hello_world"
     user "benchmarkdbuser"
     password "benchmarkdbpass"
-    host "DBHOSTNAME"
+    host os.getenv("DBHOST")

frameworks/Lua/lapis/nginx.conf

@@ -3,6 +3,7 @@
     error_log stderr notice;
     #error_log /tmp/test.log error;
     env LAPIS_ENVIRONMENT;
+    env DBHOST;
     daemon off;
 
     events {

toolset/benchmark/framework_test.py

@@ -5,6 +5,7 @@ from benchmark.test_types import *
 import importlib
 import os
 import subprocess
+import socket
 import time
 import re
 from pprint import pprint
@@ -174,7 +175,7 @@ class FrameworkTest:
 
     os.environ['TROOT'] = self.directory
     os.environ['IROOT'] = self.install_root
-    os.environ['DBHOST'] = self.database_host
+    os.environ['DBHOST'] = socket.gethostbyname(self.database_host)
     os.environ['LOGDIR'] = logDir
     os.environ['MAX_THREADS'] = str(self.benchmarker.threads)
     os.environ['MAX_CONCURRENCY'] = str(max(self.benchmarker.concurrency_levels))
@@ -228,7 +229,7 @@ class FrameworkTest:
       %s/TFBReaper "bash -exc \\\"source %s && source %s.sh\\\"''' % (self.fwroot,
         self.directory,
         self.install_root,
-        self.database_host,
+        socket.gethostbyname(self.database_host),
         logDir,
         self.benchmarker.threads,
         max(self.benchmarker.concurrency_levels),