Fix Uperf Parsing of Connect Type Workload (via #297) (#314)

* Delete dead uperf_wrapper code

* Fix parsing of connect type workloads

Thank you josecastillolema for #297!

* Fix bug preventing discovery of uperf workload

ci/run_ci.sh

@@ -65,7 +65,7 @@ elif [[ `echo "${diff_list}" | grep -cv /` -gt 0 || `echo ${diff_list} | grep -E
 else
   echo "Running specific tests"
   echo $diff_list
-  test_list=`echo "${diff_list}" | awk -F "/" '{print $1"/"$2}' | uniq`
+  test_list=`echo "${diff_list}" | awk 'BEGIN{FS=OFS="/"}{NF--; print}' | uniq`
 fi
 
 echo -e "Running tests in the following directories:\n${test_list}"

snafu/benchmarks/uperf/uperf.py

@@ -191,7 +191,8 @@ def parse_stdout(self, stdout: str) -> UperfStdout:
         # This will yeild us this structure :
         #     timestamp, number of bytes, number of operations
         # [('1559581000962.0330', '0', '0'), ('1559581001962.8459', '4697358336', '286704') ]
-        results = re.findall(r"timestamp_ms:(.*) name:Txn2 nr_bytes:(.*) nr_ops:(.*)", stdout)
+        tx_str = "Txn1" if parsed_profile_name["test_type"] == "connect" else "Txn2"
+        results = re.findall(r"timestamp_ms:(.*) name:{} nr_bytes:(.*) nr_ops:(.*)".format(tx_str), stdout)
         # We assume message_size=write_message_size to prevent breaking dependant implementations
 
         return UperfStdout(