Changeset 1268 in xpra

Timestamp:

08/03/12 13:20:14 (10 months ago)

Author:

antoine

Message:

test xpra with ssh too

File:

• trunk/src/tests/xpra/test_measure_perf.py (modified) (6 diffs)

trunk/src/tests/xpra/test_measure_perf.py

@@ -43 +43 @@
 TRICKLE_SHAPING_OPTIONS = [(0, 0, 0), (1024, 256, 20), (1024, 256, 300), (128, 32, 100), (32, 8, 200)]
 
+XPRA_SSH_OPTIONS = [True, False]
 
 #tools we use:
@@ -399 +400 @@
     results = []
     count = 0
-    for name, tech_name, server_version, client_version, encoding, compression, (down,up,latency), test_command, client_cmd in tests:
+    for name, tech_name, server_version, client_version, encoding, compression, ssh, (down,up,latency), test_command, client_cmd in tests:
         try:
             print("**************************************************************")
@@ -434 +435 @@
                     result += [MEASURE_TIME, time.time(), CPU_INFO, PLATFORM, KERNEL_VERSION, XORG_VERSION, OPENGL_INFO, WINDOW_MANAGER]
                     result += ["%sx%s" % gdk.get_default_root_window().get_size()]
-                    result += [compression, down, up, latency]
+                    result += [compression, ssh, down, up, latency]
                     result += measure_client(server_pid, name, client_cmd, get_stats_cb)
                     results.append(result)
@@ -579 +580 @@
     print("")
     tests = []
-    for down,up,latency in TRICKLE_SHAPING_OPTIONS:
-        for x11_test_command in X11_TEST_COMMANDS:
-            for encoding in XPRA_TEST_ENCODINGS:
-                QUALITY = [-1]
-                if encoding=="jpeg":
-                    QUALITY = XPRA_JPEG_OPTIONS
-                for jpeg_q in QUALITY:
-                    comp_options = XPRA_COMPRESSION_OPTIONS
-                    for compression in comp_options:
-                        cmd = trickle_command(down, up, latency)
-                        cmd += [XPRA_BIN,
-                               "attach", "tcp:%s:%s" % (IP, PORT),
-                               "-z", str(compression), "--readonly"]
-                        if XPRA_VERSION_NO>=[0, 3]:
-                            cmd.append("--enable-pings")
-                        if encoding=="jpeg":
-                            cmd.append("--jpeg-quality=%s" % jpeg_q)
-                            name = "%s-%s" % (encoding, jpeg_q)
-                        else:
-                            name = encoding
-                        if encoding!="mmap":
-                            cmd.append("--no-mmap")
-                            cmd.append("--encoding=%s" % encoding)
-                        command_name = get_command_name(x11_test_command)
-                        test_name = "%s (%s - %s - %s)" % (name, command_name, compression, trickle_str(down, up, latency))
-                        tests.append((test_name, "xpra", XPRA_VERSION, XPRA_VERSION, encoding, compression, (down,up,latency), x11_test_command, cmd))
-    return with_server(XPRA_SERVER_START_COMMAND, XPRA_SERVER_STOP_COMMANDS, tests, xpra_get_stats)
+    for SSH in XPRA_SSH_OPTIONS:
+        for down,up,latency in TRICKLE_SHAPING_OPTIONS:
+            for x11_test_command in X11_TEST_COMMANDS:
+                for encoding in XPRA_TEST_ENCODINGS:
+                    QUALITY = [-1]
+                    if encoding=="jpeg":
+                        QUALITY = XPRA_JPEG_OPTIONS
+                    for jpeg_q in QUALITY:
+                        comp_options = XPRA_COMPRESSION_OPTIONS
+                        for compression in comp_options:
+                            cmd = trickle_command(down, up, latency)
+                            cmd += [XPRA_BIN, "attach"]
+                            if SSH:
+                                cmd.append("ssh:%s:%s" % (IP, DISPLAY_NO))
+                            else:
+                                cmd.append("tcp:%s:%s" % (IP, PORT))
+                            cmd += ["-z", str(compression), "--readonly"]
+                            if XPRA_VERSION_NO>=[0, 3]:
+                                cmd.append("--enable-pings")
+                            if encoding=="jpeg":
+                                cmd.append("--jpeg-quality=%s" % jpeg_q)
+                                name = "%s-%s" % (encoding, jpeg_q)
+                            else:
+                                name = encoding
+                            if encoding!="mmap":
+                                cmd.append("--no-mmap")
+                                cmd.append("--encoding=%s" % encoding)
+                            command_name = get_command_name(x11_test_command)
+                            test_name = "%s (%s - %s - %s)" % (name, command_name, compression, trickle_str(down, up, latency))
+                            tests.append((test_name, "xpra", XPRA_VERSION, XPRA_VERSION, encoding, compression, SSH, (down,up,latency), x11_test_command, cmd))
+        return with_server(XPRA_SERVER_START_COMMAND, XPRA_SERVER_STOP_COMMANDS, tests, xpra_get_stats)
 
 
@@ -744 +749 @@
                             command_name = get_command_name(x11_test_command)
                             test_name = "vnc (%s - %s - %s - compression=%s - %s - %s)" % (command_name, encoding, zlibtxt, compression, jpegtxt, trickle_str(down, up, latency))
-                            tests.append((test_name, "vnc", XVNC_VERSION, VNCVIEWER_VERSION, encoding, compression, (down,up,latency), x11_test_command, cmd))
+                            tests.append((test_name, "vnc", XVNC_VERSION, VNCVIEWER_VERSION, encoding, compression, False, (down,up,latency), x11_test_command, cmd))
     return with_server(XVNC_SERVER_START_COMMAND, XVNC_SERVER_STOP_COMMANDS, tests, get_vnc_stats)
 
@@ -765 +770 @@
                "Encoding", "Test Command", "Sample Duration (s)", "Sample Time (epoch)",
                "CPU info", "Platform", "Kernel Version", "Xorg version", "OpenGL", "Client Window Manager", "Screen Size",
-               "compression", "download limit (KB)", "upload limit (KB)", "latency (ms)",
+               "compression", "ssh", "download limit (KB)", "upload limit (KB)", "latency (ms)",
                "packets in/s", "packets in: bytes/s", "packets out/s", "packets out: bytes/s"]
     headers += get_stats_headers()