Switch to bash for Unicode tests

scripts/kill.py

@@ -13,8 +13,7 @@ def main():
     def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
     parser = argparse.ArgumentParser(
         description = 'Kill/remove a process from the NilmRun server',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument("-V", "--version", action="version",
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
         version = nilmrun.__version__)
     group = parser.add_argument_group("Standard options")
     group.add_argument('-u', '--url',

scripts/nilmrun_server.py

@@ -10,9 +10,7 @@ def main():
 
     parser = argparse.ArgumentParser(
         description = 'Run the NilmRun server',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
-
-    parser.add_argument("-V", "--version", action="version",
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
         version = nilmrun.__version__)
 
     group = parser.add_argument_group("Standard options")

scripts/ps.py

@@ -13,8 +13,7 @@ def main():
     def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
     parser = argparse.ArgumentParser(
         description = 'List NilmRun processes',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument("-V", "--version", action="version",
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
         version = nilmrun.__version__)
     group = parser.add_argument_group("Standard options")
     group.add_argument('-u', '--url',
@@ -40,13 +39,14 @@ def main():
            round(info['system']['mem_used'] * 100.0
                  / info['system']['mem_total']))
 
+    # Print process detail for each managed process
+    fmt = "%-36s %-6s %-15s %-4s %-3s %-5s\n"
+    printf(fmt, "PID", "STATE", "SINCE", "PROC", "CPU", "LOG")
+
     if len(info['pids']) == 0:
         printf("No running processes\n")
         raise SystemExit(0)
 
-    # Print process detail for each managed process
-    fmt = "%-36s %-6s %-15s %-4s %-3s %-5s\n"
-    printf(fmt, "PID", "STATE", "SINCE", "PROC", "CPU", "LOG")
     for pid in sorted(info['pids'].keys()):
         pidinfo = client.get("process/status", { "pid": pid })
         if pidinfo['alive']:

scripts/run.py

@@ -14,8 +14,7 @@ def main():
     def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
     parser = argparse.ArgumentParser(
         description = 'Run a command on the NilmRun server',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument("-V", "--version", action="version",
+        formatter_class = argparse.ArgumentDefaultsHelpFormatter,
         version = nilmrun.__version__)
     group = parser.add_argument_group("Standard options")
     group.add_argument('-u', '--url',

tests/test_nilmrun.py

@@ -352,8 +352,8 @@ class TestClient(object):
         # start some processes
         a = client.post("run/command", { "argv": ["sleep","60"] } )
         b = client.post("run/command", { "argv": ["sh","-c","sleep 2;true"] } )
-        c = client.post("run/command", { "argv": ["sh","-c","burnP5;true"] } )
-        d = client.post("run/command", { "argv": ["burnP5" ] } )
+        c = client.post("run/command", { "argv": ["sh","-c","dd if=/dev/zero of=/dev/null;true"] } )
+        d = client.post("run/command", { "argv": ["dd", "if=/dev/zero", "of=/dev/null" ] } )
 
         info = client.get("process/info")
         eq_(info["pids"][a]["procs"], 1)
@@ -365,9 +365,13 @@ class TestClient(object):
         lt_(20, info["pids"][c]["cpu_percent"])
         lt_(80, info["system"]["cpu_percent"])
 
-        time.sleep(2)
+        for x in range(10):
+            time.sleep(1)
             info = client.get("process/info")
-        eq_(info["pids"][b]["procs"], 0)
+            if info["pids"][b]["procs"] != 2:
+                break
+        else:
+            raise Exception("process B didn't die: " + str(info["pids"][b]))
 
         # kill all processes
         for pid in client.get("process/list"):
@@ -377,7 +381,7 @@ class TestClient(object):
         client = HTTPClient(baseurl = testurl, post_json = True)
         eq_(client.get("process/list"), [])
         def verify(cmd, result):
-            pid = client.post("run/command", { "argv": [ "sh", "-c", cmd ] })
+            pid = client.post("run/command", { "argv": [ "/bin/bash", "-c", cmd ] })
             eq_(client.get("process/list"), [pid])
             status = self.wait_end(client, pid)
             eq_(result, status["log"])