From c4f33ac9f27ef29ae7880b181147674e8376df09 Mon Sep 17 00:00:00 2001
From: Gunes Acar <gunes.acar@esat.kuleuven.be>
Date: Thu, 15 Dec 2016 16:43:38 +0100
Subject: [PATCH] Don't use the system Firefox binary in the manual tests.

Log table name for DB inserts to terminal.
Update terminal colors used in the manual test to be more readable.

Switch to test directory before starting the web server.

Regenerate openwpm.xpi.
---
 automation/Extension/firefox/lib/loggingdb.js |   8 ++++--
 automation/Extension/firefox/openwpm.xpi      | Bin 26562 -> 26634 bytes
 test/manual_test.py                           |  26 ++++++++++++++----
 test/utilities.py                             |   3 ++
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/automation/Extension/firefox/lib/loggingdb.js b/automation/Extension/firefox/lib/loggingdb.js
index 42bde568..08ab47d3 100644
--- a/automation/Extension/firefox/lib/loggingdb.js
+++ b/automation/Extension/firefox/lib/loggingdb.js
@@ -57,10 +57,12 @@ exports.executeSQL = function(statement, async) {
     // send to console if debugging
     // TODO remove async argument
     if (debugging) {
-        if (typeof statement == 'string')
+        if (typeof statement == 'string'){
             console.log("SQLite",statement);
-        else
-            console.log("SQLite",statement[1]);
+        }else{  // log the table name and values to be inserted
+            var table_name = statement[0].replace("INSERT INTO ", "").split(" ")[0];
+            console.log("SQLite", table_name, statement[1]);
+        }
         return;
     }
     // catch statements without arguments
diff --git a/automation/Extension/firefox/openwpm.xpi b/automation/Extension/firefox/openwpm.xpi
index 7ab456295438d57f60f331ac667115bbecd169d1..e6ef7075aa9d76a017c2673faa7f1c3ef7e90157 100644
GIT binary patch
delta 2342
zcmZ8j3p`Y58y~|kE0U>XoH2$p>lQVZWL;`pCNxPx!?+A)1|d<c$z>8ER<fr>8MjEW
zh>$LFO;{?steD1(s13Q)CQG^OndAGu{q+8R@A*H^^ZuX9Iq&;>-qZSABBfVC{;-3j
zlq^C#(o)ki<Oz~u*rm1u0z26JpNABL!GXR8>-nd&V1B-#7(krVxEQPdu$B~K%~|YL
z30Qau;9&ujLG{B1A?oU8SolfBc5S6abwX?aEAYiIF5y~X!cjF291QH$Ai{=4jg__N
z)uzvpu!XPFuK)|5iNlieP!PN12z~_~g+PeFG;=JMdg7(YrblnxcA52)G&(0jG6?7g
z)NRL`1Nf%Xc;xni8`TwQdS#l-4z0gLKV0aSnMj`s-55uGCdU>waEhI2L2XJLiLt0Z
zmxp(uEZ@=hKR!Kg_UoJE;Dz^}_3H3vZ_1a8-iJxQu2M`1ylN58m`boBg-dsdu9=lP
zls&$y%oP>VXxkDu)O4K=ogW}&zvyOq>7P8UE-U}^qGhU}IqA)jmLtlg$b5~Qe16yN
zX-pB-^U1Uj+i>&<Hn&sO-n3NT8SEwnJ?kQ&+&hfJzuYhN>5R>FdbD^xabW6+4SQC|
ziCqawYLN%z_$G4{>SdH>BHebW(uTmQlBhG}>XQ9({N!jkWyU?71Mwpv@e7?;7ptbC
z=Kiu%BJb(dM&RkU2?+y~?ek8VJBsHoA5`AGP31ceLZy4KmdVaMRm~W0TDAwPSRbuX
z25JV@m?caJ;>P?=miJYKAis6is;SJ)a5F#c5z-qevJ4FW#xb^m*RDtBSbl6pweNk%
zy+G!pnS_ULs`+v;2TM(F&r<BaADLJ!)eW0TnN+CV%JFv0inl%S$L|=1FT3Neg@N;Z
zFK6y?mjGfd;F-zhyQ^Vq8f)$D4JlC)U0Ta;F<t4H&+|z~6<4pn9=)V6gaUpXLFF1@
zCN4@F?>1nC#T;mAIvT3=NIxSp`L%y3m-miM?Ae+=UFfw@GocvaYFL4{_E)TFIWzKM
zo+tNH?PV2G)6FxS)DElKBr=&DWj-!xebe+K$~-b!?@-T#+$6>M;GUzmlL8KwR^ZX*
zIt;^Q?U1%<wNUNf>n@YHpI-N6j=g)UczO!Es#anyrG+csBRQQ$QEqp{dJ!s4a<4TV
zLJsdiYNKyl%ou)13b7i)1>mTT;o7-}f;@7PzC4V&GE^rx_mNHBc|7HXOYh<Wt?$B+
z3t?M%ce9rQU+X(nxv0K2eQqw{l-Uf<-1QMs$ZHA?3h3^URkq(t^iDBiC8I*Dor<db
zJR|f<`}dJI;cVL&xq0P%)O>Y&F7<kWj&(}b^1{ctzIqwsm8G!fVGm5yh!0vzY<VBl
z-Mv<$P{Q5SKiC)e+&&>-9b@Vod@vbfB+OzZzF@wP88#YK77AWHT^0_qDJLG|%`cff
zW5pt6^oY-_WBsC~M{Q&yyH&Q`E%KSn^c{#^a324;`{oWt&3>xx`@qA3W$w(=$7g=_
zkkTyU9-oLd><pShlclgZvr7wu93tOmIEH)XeD(g1#PJauGV@boAzgh%`5yh6OFejR
zmg@G!0+ak|$$bf*u1@APe_v*kCQ(L{cC4c<DFtTT+R!tJIi;hM%<KC5#8`T`XBS4Y
z@WzI|i|6Zj?wEu-1r48v-*M3*|GTKr^vh($cEIhHXIpii@4%>F%*`Nrn#LP5f7@u3
zUPW9jAZ1ZHi|$`(kH;nHU2iuQ5jX9u_L$G}tnM~nbUjzB{Bq*&_(9H(G*9*I&A;G9
zO2;@hx6jR>_92ROo%DglefaCotlut2ToJZK)&KfjB`9Eg-vV7a{snhg&t#^=ZLyWt
zV8tD5c!I^;`DROFFx@F#5Nh!ToBwKm8nf@*a+iY9#+Pqu=a80^2Cm&PyO>tjjP7&=
za5leWIM%1gj>=luY#q3{f&U@zl3?Q&tbE|0ETzD>B^6M*zp4IliLP$j+}S(AmBo<Q
zxQ>d5`=7WDQu?N)L5~bmR7Qe(Y40mf4((|gFmstB%-y*mKwBHA(nlM$q}<<yXaCl)
zBKhCOjuu}8HA&=+Yh5<mCRYk>uFdw(H;4t$#6A%=jL{;IisEjI)Sc_xB8fnJhB~eq
z_<;t1BP^MkR#*I51TT91+AW~$mATgItG#!@kzRWnz^LT2h6j91U_IW)3dU6*0NIHE
zaSRn$?eYP%Ya|eez)*i?q<&DuVFwB17KHfnf@`+3DfdJULs|#KQ3WXsHSj7{0sP`C
zM-W$OMCx@BL8~p$swRa04vaJy=SzZ9>}3E*LmAMOv8JX%sw^73#ZZMqfRzClG~}*}
zL?E{R>kmmK09dH9L!1i^BkKo%zxe{-KEJK7qtsBHZ74*$22Eg{<4aYr0k8VMB4@7*
z191?c4VuJt#PfKtR}~9R`2ui;Lcc>W{^e&3qprULoGGbNZy_5hkB3GeaO(n06F~w~
z2PQZ91IQ+AP~fi#s~kwp+zV#<6TiAV-I%*!LMjuGXa#RFHDIj=()z%0CJs)xpF;>q
z-+(|2LgnsQmoUN}EOb=?(^y!TI8VzO5dTpefTsF7qKzv|v|z1$toYWk;=Rx-xIo8g
z{YE`qBkp7?!-bTx0OSE0<g0$*>!Tp_vkl0AcFGevmQZp3H?Gpf2PoncBRE(;+@JN8
TBN)d9B%Hxqwwm;$x7h0+R`|#>

delta 2141
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
aU_i_jtO?%vt51cVH25YMD_QC<YWfERjFET%

diff --git a/test/manual_test.py b/test/manual_test.py
index 3ce84d78..c820ee15 100644
--- a/test/manual_test.py
+++ b/test/manual_test.py
@@ -1,6 +1,10 @@
 from utilities import BASE_TEST_URL, start_server
+from os.path import dirname, join, realpath
 import subprocess
 
+OPENWPM_LOG_PREFIX = "console.log: openwpm: "
+INSERT_PREFIX = "Array"
+
 
 class bcolors:
     HEADER = '\033[95m'
@@ -13,20 +17,30 @@ class bcolors:
     UNDERLINE = '\033[4m'
 
 
-def run_cmd(command):
+def get_command_output(command, cwd=None):
     popen = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT)
+                             stderr=subprocess.STDOUT, cwd=cwd)
     return iter(popen.stdout.readline, b"")
 
+def colorize(line):
+    if INSERT_PREFIX in line:  # print long DB insert lines in blue
+        line = line.replace(INSERT_PREFIX, bcolors.OKBLUE + INSERT_PREFIX)
+    if OPENWPM_LOG_PREFIX in line:
+        line = line.replace(OPENWPM_LOG_PREFIX,
+                            OPENWPM_LOG_PREFIX + bcolors.OKGREEN)
+    return line
 
 def start_manual_test():
-    cmd_cd = "cd ../automation/Extension/firefox/"
-    cmd_jpm = "jpm run --binary-args '%s' -b `which firefox`" % BASE_TEST_URL
+    base_dir = dirname(dirname(realpath(__file__)))
+    ext_path = join(base_dir, 'automation', 'Extension', 'firefox')
+    ff_bin_path = join(base_dir, 'firefox-bin', 'firefox')
+    cmd_jpm_run = "jpm run --binary-args 'url %s' -b %s" % (BASE_TEST_URL,
+                                                        ff_bin_path)
     server, thread = start_server()
     try:
         # http://stackoverflow.com/a/4417735/3104416
-        for line in run_cmd("%s && %s" % (cmd_cd, cmd_jpm)):
-            print bcolors.OKGREEN, line, bcolors.ENDC,
+        for line in get_command_output(cmd_jpm_run, cwd=ext_path):
+            print colorize(line), bcolors.ENDC,
     except KeyboardInterrupt:
         print "Keyboard Interrupt detected, shutting down..."
     print "\nClosing server thread..."
diff --git a/test/utilities.py b/test/utilities.py
index d6d91a79..5e7f0a54 100644
--- a/test/utilities.py
+++ b/test/utilities.py
@@ -7,6 +7,7 @@ import plyvel
 import os
 import sqlite3
 from random import choice
+from os.path import realpath, dirname
 LOCAL_WEBSERVER_PORT = 8000
 PSL_CACHE_LOC = '/tmp/public_suffix_list.dat'
 BASE_TEST_URL_DOMAIN = "localtest.me"
@@ -27,6 +28,8 @@ def start_server():
     `http://localtest.me:8000/test_pages/...`
     """
     print "Starting HTTP Server in a separate thread"
+    # switch to test dir, this is where the test files are
+    os.chdir(dirname(realpath(__file__)))
     Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
     server = MyTCPServer(("localhost", LOCAL_WEBSERVER_PORT), Handler)
     thread = threading.Thread(target=server.serve_forever)