framework_test.py 25 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600
  1. import importlib
  2. import os
  3. import subprocess
  4. import time
  5. import re
  6. import pprint
  7. import sys
  8. import traceback
  9. class FrameworkTest:
  10. ##########################################################################################
  11. # Class variables
  12. ##########################################################################################
  13. headers_template = "-H 'Host: localhost' -H '{accept}' -H 'Connection: keep-alive'"
  14. headers_full_template = "-H 'Host: localhost' -H '{accept}' -H 'Accept-Language: en-US,en;q=0.5' -H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64) Gecko/20130501 Firefox/30.0 AppleWebKit/600.00 Chrome/30.0.0000.0 Trident/10.0 Safari/600.00' -H 'Cookie: uid=12345678901234567890; __utma=1.1234567890.1234567890.1234567890.1234567890.12; wd=2560x1600' -H 'Connection: keep-alive'"
  15. accept_json = "Accept: application/json,text/html;q=0.9,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7"
  16. accept_html = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
  17. accept_plaintext = "Accept: text/plain,text/html;q=0.9,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7"
  18. concurrency_template = """
  19. echo ""
  20. echo "---------------------------------------------------------"
  21. echo " Running Primer {name}"
  22. echo " {wrk} {headers} -d 5 -c 8 -t 8 \"http://{server_host}:{port}{url}\""
  23. echo "---------------------------------------------------------"
  24. echo ""
  25. {wrk} {headers} -d 5 -c 8 -t 8 "http://{server_host}:{port}{url}"
  26. sleep 5
  27. echo ""
  28. echo "---------------------------------------------------------"
  29. echo " Running Warmup {name}"
  30. echo " {wrk} {headers} -d {duration} -c {max_concurrency} -t {max_threads} \"http://{server_host}:{port}{url}\""
  31. echo "---------------------------------------------------------"
  32. echo ""
  33. {wrk} {headers} -d {duration} -c {max_concurrency} -t {max_threads} "http://{server_host}:{port}{url}"
  34. sleep 5
  35. for c in {interval}
  36. do
  37. echo ""
  38. echo "---------------------------------------------------------"
  39. echo " Concurrency: $c for {name}"
  40. echo " {wrk} {headers} {pipeline} -d {duration} -c $c -t $(($c>{max_threads}?{max_threads}:$c)) \"http://{server_host}:{port}{url}\""
  41. echo "---------------------------------------------------------"
  42. echo ""
  43. {wrk} {headers} {pipeline} -d {duration} -c "$c" -t "$(($c>{max_threads}?{max_threads}:$c))" http://{server_host}:{port}{url}
  44. sleep 2
  45. done
  46. """
  47. query_template = """
  48. echo ""
  49. echo "---------------------------------------------------------"
  50. echo " Running Primer {name}"
  51. echo " wrk {headers} -d 5 -c 8 -t 8 \"http://{server_host}:{port}{url}2\""
  52. echo "---------------------------------------------------------"
  53. echo ""
  54. wrk {headers} -d 5 -c 8 -t 8 "http://{server_host}:{port}{url}2"
  55. sleep 5
  56. echo ""
  57. echo "---------------------------------------------------------"
  58. echo " Running Warmup {name}"
  59. echo " wrk {headers} -d {duration} -c {max_concurrency} -t {max_threads} \"http://{server_host}:{port}{url}2\""
  60. echo "---------------------------------------------------------"
  61. echo ""
  62. wrk {headers} -d {duration} -c {max_concurrency} -t {max_threads} "http://{server_host}:{port}{url}2"
  63. sleep 5
  64. for c in {interval}
  65. do
  66. echo ""
  67. echo "---------------------------------------------------------"
  68. echo " Queries: $c for {name}"
  69. echo " wrk {headers} -d {duration} -c {max_concurrency} -t {max_threads} \"http://{server_host}:{port}{url}$c\""
  70. echo "---------------------------------------------------------"
  71. echo ""
  72. wrk {headers} -d {duration} -c {max_concurrency} -t {max_threads} "http://{server_host}:{port}{url}$c"
  73. sleep 2
  74. done
  75. """
  76. language = None
  77. platform = None
  78. webserver = None
  79. classification = None
  80. database = None
  81. approach = None
  82. orm = None
  83. framework = None
  84. os = None
  85. database_os = None
  86. display_name = None
  87. notes = None
  88. versus = None
  89. ##########################################################################################
  90. # Public Methods
  91. ##########################################################################################
  92. ############################################################
  93. # start(benchmarker)
  94. # Start the test using it's setup file
  95. ############################################################
  96. def start(self, out, err):
  97. return self.setup_module.start(self.benchmarker, out)
  98. ############################################################
  99. # End start
  100. ############################################################
  101. ############################################################
  102. # stop(benchmarker)
  103. # Stops the test using it's setup file
  104. ############################################################
  105. def stop(self, out, err):
  106. return self.setup_module.stop(out)
  107. ############################################################
  108. # End stop
  109. ############################################################
  110. ############################################################
  111. # verify_urls
  112. # Verifys each of the URLs for this test. THis will sinply
  113. # curl the URL and check for it's return status.
  114. # For each url, a flag will be set on this object for whether
  115. # or not it passed
  116. ############################################################
  117. def verify_urls(self, out, err):
  118. # JSON
  119. try:
  120. out.write( "VERIFYING JSON (" + self.json_url + ") ...\n" )
  121. out.flush()
  122. url = self.benchmarker.generate_url(self.json_url, self.port)
  123. self.__curl_url(url, out, err)
  124. self.json_url_passed = True
  125. except (AttributeError, subprocess.CalledProcessError) as e:
  126. self.json_url_passed = False
  127. # DB
  128. try:
  129. out.write( "VERIFYING DB (" + self.db_url + ") ...\n" )
  130. out.flush()
  131. url = self.benchmarker.generate_url(self.db_url, self.port)
  132. self.__curl_url(url, out, err)
  133. self.db_url_passed = True
  134. except (AttributeError, subprocess.CalledProcessError) as e:
  135. self.db_url_passed = False
  136. # Query
  137. try:
  138. out.write( "VERIFYING Query (" + self.query_url + "2) ...\n" )
  139. out.flush()
  140. url = self.benchmarker.generate_url(self.query_url + "2", self.port)
  141. self.__curl_url(url, out, err)
  142. self.query_url_passed = True
  143. except (AttributeError, subprocess.CalledProcessError) as e:
  144. self.query_url_passed = False
  145. # Fortune
  146. try:
  147. out.write( "VERIFYING Fortune (" + self.fortune_url + ") ...\n" )
  148. out.flush()
  149. url = self.benchmarker.generate_url(self.fortune_url, self.port)
  150. self.__curl_url(url, out, err)
  151. self.fortune_url_passed = True
  152. except (AttributeError, subprocess.CalledProcessError) as e:
  153. self.fortune_url_passed = False
  154. # Update
  155. try:
  156. out.write( "VERIFYING Update (" + self.update_url + "2) ...\n" )
  157. out.flush()
  158. url = self.benchmarker.generate_url(self.update_url + "2", self.port)
  159. self.__curl_url(url, out, err)
  160. self.update_url_passed = True
  161. except (AttributeError, subprocess.CalledProcessError) as e:
  162. self.update_url_passed = False
  163. # plaintext
  164. try:
  165. out.write( "VERIFYING Plaintext (" + self.plaintext_url + ") ...\n" )
  166. out.flush()
  167. url = self.benchmarker.generate_url(self.plaintext_url, self.port)
  168. self.__curl_url(url, out, err)
  169. self.plaintext_url_passed = True
  170. except (AttributeError, subprocess.CalledProcessError) as e:
  171. self.plaintext_url_passed = False
  172. ############################################################
  173. # End verify_urls
  174. ############################################################
  175. ############################################################
  176. # contains_type(type)
  177. # true if this test contains an implementation of the given
  178. # test type (json, db, etc.)
  179. ############################################################
  180. def contains_type(self, type):
  181. try:
  182. if type == 'json' and self.json_url != None:
  183. return True
  184. if type == 'db' and self.db_url != None:
  185. return True
  186. if type == 'query' and self.query_url != None:
  187. return True
  188. if type == 'fortune' and self.fortune_url != None:
  189. return True
  190. if type == 'update' and self.update_url != None:
  191. return True
  192. if type == 'plaintext' and self.plaintext_url != None:
  193. return True
  194. except AttributeError:
  195. pass
  196. return False
  197. ############################################################
  198. # End stop
  199. ############################################################
  200. ############################################################
  201. # benchmark
  202. # Runs the benchmark for each type of test that it implements
  203. # JSON/DB/Query.
  204. ############################################################
  205. def benchmark(self, out, err):
  206. # JSON
  207. try:
  208. if self.json_url_passed and (self.benchmarker.type == "all" or self.benchmarker.type == "json"):
  209. out.write("BENCHMARKING JSON ... ")
  210. out.flush()
  211. remote_script = self.__generate_concurrency_script(self.json_url, self.port, self.accept_json)
  212. self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'json'), err)
  213. results = self.__parse_test('json')
  214. self.benchmarker.report_results(framework=self, test="json", results=results['results'])
  215. out.write( "Complete\n" )
  216. out.flush()
  217. except AttributeError:
  218. pass
  219. # DB
  220. try:
  221. if self.db_url_passed and (self.benchmarker.type == "all" or self.benchmarker.type == "db"):
  222. out.write("BENCHMARKING DB ... ")
  223. out.flush()
  224. remote_script = self.__generate_concurrency_script(self.db_url, self.port, self.accept_json)
  225. self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'db'), err)
  226. results = self.__parse_test('db')
  227. self.benchmarker.report_results(framework=self, test="db", results=results['results'])
  228. out.write( "Complete\n" )
  229. except AttributeError:
  230. traceback.print_exc()
  231. pass
  232. # Query
  233. try:
  234. if self.query_url_passed and (self.benchmarker.type == "all" or self.benchmarker.type == "query"):
  235. out.write("BENCHMARKING Query ... ")
  236. out.flush()
  237. remote_script = self.__generate_query_script(self.query_url, self.port, self.accept_json)
  238. self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'query'), err)
  239. results = self.__parse_test('query')
  240. self.benchmarker.report_results(framework=self, test="query", results=results['results'])
  241. out.write( "Complete\n" )
  242. out.flush()
  243. except AttributeError:
  244. traceback.print_exc()
  245. pass
  246. # fortune
  247. try:
  248. if self.fortune_url_passed and (self.benchmarker.type == "all" or self.benchmarker.type == "fortune"):
  249. out.write("BENCHMARKING Fortune ... ")
  250. out.flush()
  251. remote_script = self.__generate_concurrency_script(self.fortune_url, self.port, self.accept_html)
  252. self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'fortune'), err)
  253. results = self.__parse_test('fortune')
  254. self.benchmarker.report_results(framework=self, test="fortune", results=results['results'])
  255. out.write( "Complete\n" )
  256. out.flush()
  257. except AttributeError:
  258. traceback.print_exc()
  259. pass
  260. # update
  261. try:
  262. if self.update_url_passed and (self.benchmarker.type == "all" or self.benchmarker.type == "update"):
  263. out.write("BENCHMARKING Update ... ")
  264. out.flush()
  265. remote_script = self.__generate_query_script(self.update_url, self.port, self.accept_json)
  266. self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'update'), err)
  267. results = self.__parse_test('update')
  268. self.benchmarker.report_results(framework=self, test="update", results=results['results'])
  269. out.write( "Complete\n" )
  270. out.flush()
  271. except AttributeError:
  272. # TODO - this needs to report some logging
  273. traceback.print_exc()
  274. pass
  275. # plaintext
  276. try:
  277. if self.plaintext_url_passed and (self.benchmarker.type == "all" or self.benchmarker.type == "plaintext"):
  278. out.write("BENCHMARKING Plaintext ... ")
  279. out.flush()
  280. remote_script = self.__generate_concurrency_script(self.plaintext_url, self.port, self.accept_plaintext, wrk_command="wrk-pipeline", intervals=[256,1024,4096,16384], pipeline="--pipeline 16")
  281. self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'plaintext'), err)
  282. results = self.__parse_test('plaintext')
  283. self.benchmarker.report_results(framework=self, test="plaintext", results=results['results'])
  284. out.write( "Complete\n" )
  285. out.flush()
  286. except AttributeError:
  287. traceback.print_exc()
  288. pass
  289. ############################################################
  290. # End benchmark
  291. ############################################################
  292. ############################################################
  293. # parse_all
  294. # Method meant to be run for a given timestamp
  295. ############################################################
  296. def parse_all(self):
  297. # JSON
  298. if os.path.exists(self.benchmarker.output_file(self.name, 'json')):
  299. results = self.__parse_test('json')
  300. self.benchmarker.report_results(framework=self, test="json", results=results['results'])
  301. # DB
  302. if os.path.exists(self.benchmarker.output_file(self.name, 'db')):
  303. results = self.__parse_test('db')
  304. self.benchmarker.report_results(framework=self, test="db", results=results['results'])
  305. # Query
  306. if os.path.exists(self.benchmarker.output_file(self.name, 'query')):
  307. results = self.__parse_test('query')
  308. self.benchmarker.report_results(framework=self, test="query", results=results['results'])
  309. # Fortune
  310. if os.path.exists(self.benchmarker.output_file(self.name, 'fortune')):
  311. results = self.__parse_test('fortune')
  312. self.benchmarker.report_results(framework=self, test="fortune", results=results['results'])
  313. # Update
  314. if os.path.exists(self.benchmarker.output_file(self.name, 'update')):
  315. results = self.__parse_test('update')
  316. self.benchmarker.report_results(framework=self, test="update", results=results['results'])
  317. # Plaintext
  318. if os.path.exists(self.benchmarker.output_file(self.name, 'plaintext')):
  319. results = self.__parse_test('plaintext')
  320. self.benchmarker.report_results(framework=self, test="plaintext", results=results['results'])
  321. ############################################################
  322. # End parse_all
  323. ############################################################
  324. ############################################################
  325. # __parse_test(test_type)
  326. ############################################################
  327. def __parse_test(self, test_type):
  328. try:
  329. results = dict()
  330. results['results'] = []
  331. with open(self.benchmarker.output_file(self.name, test_type)) as raw_data:
  332. is_warmup = True
  333. rawData = None
  334. for line in raw_data:
  335. if "Queries:" in line or "Concurrency:" in line:
  336. is_warmup = False
  337. rawData = None
  338. continue
  339. if "Warmup" in line or "Primer" in line:
  340. is_warmup = True
  341. continue
  342. if not is_warmup:
  343. if rawData == None:
  344. rawData = dict()
  345. results['results'].append(rawData)
  346. #if "Requests/sec:" in line:
  347. # m = re.search("Requests/sec:\s+([0-9]+)", line)
  348. # rawData['reportedResults'] = m.group(1)
  349. # search for weighttp data such as succeeded and failed.
  350. if "Latency" in line:
  351. m = re.findall("([0-9]+\.*[0-9]*[us|ms|s|m|%]+)", line)
  352. if len(m) == 4:
  353. rawData['latencyAvg'] = m[0]
  354. rawData['latencyStdev'] = m[1]
  355. rawData['latencyMax'] = m[2]
  356. # rawData['latencyStdevPercent'] = m[3]
  357. #if "Req/Sec" in line:
  358. # m = re.findall("([0-9]+\.*[0-9]*[k|%]*)", line)
  359. # if len(m) == 4:
  360. # rawData['requestsAvg'] = m[0]
  361. # rawData['requestsStdev'] = m[1]
  362. # rawData['requestsMax'] = m[2]
  363. # rawData['requestsStdevPercent'] = m[3]
  364. #if "requests in" in line:
  365. # m = re.search("requests in ([0-9]+\.*[0-9]*[ms|s|m|h]+)", line)
  366. # if m != None:
  367. # # parse out the raw time, which may be in minutes or seconds
  368. # raw_time = m.group(1)
  369. # if "ms" in raw_time:
  370. # rawData['total_time'] = float(raw_time[:len(raw_time)-2]) / 1000.0
  371. # elif "s" in raw_time:
  372. # rawData['total_time'] = float(raw_time[:len(raw_time)-1])
  373. # elif "m" in raw_time:
  374. # rawData['total_time'] = float(raw_time[:len(raw_time)-1]) * 60.0
  375. # elif "h" in raw_time:
  376. # rawData['total_time'] = float(raw_time[:len(raw_time)-1]) * 3600.0
  377. if "requests in" in line:
  378. m = re.search("([0-9]+) requests in", line)
  379. if m != None:
  380. rawData['totalRequests'] = int(m.group(1))
  381. if "Socket errors" in line:
  382. if "connect" in line:
  383. m = re.search("connect ([0-9]+)", line)
  384. rawData['connect'] = int(m.group(1))
  385. if "read" in line:
  386. m = re.search("read ([0-9]+)", line)
  387. rawData['read'] = int(m.group(1))
  388. if "write" in line:
  389. m = re.search("write ([0-9]+)", line)
  390. rawData['write'] = int(m.group(1))
  391. if "timeout" in line:
  392. m = re.search("timeout ([0-9]+)", line)
  393. rawData['timeout'] = int(m.group(1))
  394. if "Non-2xx" in line:
  395. m = re.search("Non-2xx or 3xx responses: ([0-9]+)", line)
  396. if m != None:
  397. rawData['5xx'] = int(m.group(1))
  398. return results
  399. except IOError:
  400. return None
  401. ############################################################
  402. # End benchmark
  403. ############################################################
  404. ##########################################################################################
  405. # Private Methods
  406. ##########################################################################################
  407. ############################################################
  408. # __run_benchmark(script, output_file)
  409. # Runs a single benchmark using the script which is a bash
  410. # template that uses weighttp to run the test. All the results
  411. # outputed to the output_file.
  412. ############################################################
  413. def __run_benchmark(self, script, output_file, err):
  414. with open(output_file, 'w') as raw_file:
  415. p = subprocess.Popen(self.benchmarker.client_ssh_string.split(" "), stdin=subprocess.PIPE, stdout=raw_file, stderr=err)
  416. p.communicate(script)
  417. err.flush()
  418. ############################################################
  419. # End __run_benchmark
  420. ############################################################
  421. ############################################################
  422. # __generate_concurrency_script(url, port)
  423. # Generates the string containing the bash script that will
  424. # be run on the client to benchmark a single test. This
  425. # specifically works for the variable concurrency tests (JSON
  426. # and DB)
  427. ############################################################
  428. def __generate_concurrency_script(self, url, port, accept_header, wrk_command="wrk", intervals=[], pipeline=""):
  429. if len(intervals) == 0:
  430. intervals = self.benchmarker.concurrency_levels
  431. headers = self.__get_request_headers(accept_header)
  432. return self.concurrency_template.format(max_concurrency=self.benchmarker.max_concurrency,
  433. max_threads=self.benchmarker.max_threads, name=self.name, duration=self.benchmarker.duration,
  434. interval=" ".join("{}".format(item) for item in intervals),
  435. server_host=self.benchmarker.server_host, port=port, url=url, headers=headers, wrk=wrk_command,
  436. pipeline=pipeline)
  437. ############################################################
  438. # End __generate_concurrency_script
  439. ############################################################
  440. ############################################################
  441. # __generate_query_script(url, port)
  442. # Generates the string containing the bash script that will
  443. # be run on the client to benchmark a single test. This
  444. # specifically works for the variable query tests (Query)
  445. ############################################################
  446. def __generate_query_script(self, url, port, accept_header):
  447. headers = self.__get_request_headers(accept_header)
  448. return self.query_template.format(max_concurrency=self.benchmarker.max_concurrency,
  449. max_threads=self.benchmarker.max_threads, name=self.name, duration=self.benchmarker.duration,
  450. interval=" ".join("{}".format(item) for item in self.benchmarker.query_intervals),
  451. server_host=self.benchmarker.server_host, port=port, url=url, headers=headers)
  452. ############################################################
  453. # End __generate_query_script
  454. ############################################################
  455. ############################################################
  456. # __get_request_headers(accept_header)
  457. # Generates the complete HTTP header string
  458. ############################################################
  459. def __get_request_headers(self, accept_header):
  460. return self.headers_template.format(accept=accept_header)
  461. ############################################################
  462. # End __format_request_headers
  463. ############################################################
  464. ############################################################
  465. # __curl_url
  466. # Dump HTTP response and headers. Throw exception if there
  467. # is an HTTP error.
  468. ############################################################
  469. def __curl_url(self, url, out, err):
  470. # Use -i to output response with headers.
  471. # Don't use -f so that the HTTP response code is ignored.
  472. # Use --stderr - to redirect stderr to stdout so we get
  473. # error output for sure in stdout.
  474. # Use -sS to hide progress bar, but show errors.
  475. subprocess.check_call(["curl", "-i", "-", "-sS", url], stderr=err, stdout=out)
  476. out.flush()
  477. err.flush()
  478. # HTTP output may not end in a newline, so add that here.
  479. out.write( "\n" )
  480. out.flush()
  481. # In the curl invocation above we could not use -f because
  482. # then the HTTP response would not be output, so use -f in
  483. # an additional invocation so that if there is an HTTP error,
  484. # subprocess.CalledProcessError will be thrown. Note that this
  485. # uses check_output() instead of check_call() so that we can
  486. # ignore the HTTP response because we already output that in
  487. # the first curl invocation.
  488. subprocess.check_output(["curl", "-fsS", url], stderr=err)
  489. out.flush()
  490. err.flush()
  491. # HTTP output may not end in a newline, so add that here.
  492. out.write( "\n" )
  493. out.flush()
  494. ##############################################################
  495. # End __curl_url
  496. ##############################################################
  497. ##########################################################################################
  498. # Constructor
  499. ##########################################################################################
  500. def __init__(self, name, directory, benchmarker, args):
  501. self.name = name
  502. self.directory = directory
  503. self.benchmarker = benchmarker
  504. self.__dict__.update(args)
  505. # ensure directory has __init__.py file so that we can use it as a Python package
  506. if not os.path.exists(os.path.join(directory, "__init__.py")):
  507. open(os.path.join(directory, "__init__.py"), 'w').close()
  508. self.setup_module = setup_module = importlib.import_module(directory + '.' + self.setup_file)
  509. ############################################################
  510. # End __init__
  511. ############################################################
  512. ############################################################
  513. # End FrameworkTest
  514. ############################################################
  515. ##########################################################################################
  516. # Static methods
  517. ##########################################################################################
  518. ##############################################################
  519. # parse_config(config, directory, benchmarker)
  520. # parses a config file and returns a list of FrameworkTest
  521. # objects based on that config file.
  522. ##############################################################
  523. def parse_config(config, directory, benchmarker):
  524. tests = []
  525. # The config object can specify multiple tests, we neep to loop
  526. # over them and parse them out
  527. for test in config['tests']:
  528. for key, value in test.iteritems():
  529. test_name = config['framework']
  530. # if the test uses the 'defualt' keywork, then we don't
  531. # append anything to it's name. All configs should only have 1 default
  532. if key != 'default':
  533. # we need to use the key in the test_name
  534. test_name = test_name + "-" + key
  535. tests.append(FrameworkTest(test_name, directory, benchmarker, value))
  536. return tests
  537. ##############################################################
  538. # End parse_config
  539. ##############################################################