Drizzle

Merge lp:~patrick-crews/drizzle/qp-crashme-fix into lp:drizzle

  1. qp-crashme-fix
  2. Merge into 7.2
Proposed by Patrick Crews
Status: Merged
Approved by: Brian Aker
Approved revision: 2539
Merged at revision: 2540
Proposed branch: lp:~patrick-crews/drizzle/qp-crashme-fix
Merge into: lp:drizzle
Diff against target: 19 lines (+1/-2)
1 file modified
tests/kewpie/drizzle_tests/crashme/crashme_test.py (+1/-2)
To merge this branch: bzr merge lp:~patrick-crews/drizzle/qp-crashme-fix
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+100675@code.launchpad.net

Description of the change

Tweaks / simplifies how we run the crashme tests. This paves the way for removing the dbqp code from the tree.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/kewpie/drizzle_tests/crashme/crashme_test.py'
2--- tests/kewpie/drizzle_tests/crashme/crashme_test.py 2011-12-14 00:22:48 +0000
3+++ tests/kewpie/drizzle_tests/crashme/crashme_test.py 2012-04-03 19:30:25 +0000
4@@ -23,14 +23,13 @@
5 import subprocess
6
7 from lib.util.crashme_methods import execute_crashme
8-from lib.util.mysqlBaseTestCase import mysqlBaseTestCase
9
10 server_requirements = [[]]
11 servers = []
12 server_manager = None
13 test_executor = None
14
15-class basicTest(mysqlBaseTestCase):
16+class basicTest(unittest.TestCase):
17
18 def test_runCrashme(self):
19 test_cmd = "$SQLBENCH_DIR/crash-me --server=drizzled --host=127.0.0.1 --force --dir=$DRIZZLE_TEST_WORKDIR --connect-options=port=$MASTER_MYPORT --verbose --debug --user=root --batch-mode"

Subscribers

People subscribed via source and target branches

to all changes: