Merge lp:~sergiusens/gocheck/expected_panic_regex_in_tests into lp:gocheck

Proposed by Sergio Schvezov on 2013-12-19
Status: Needs review
Proposed branch: lp:~sergiusens/gocheck/expected_panic_regex_in_tests
Merge into: lp:gocheck
Diff against target: 54 lines (+13/-3)
1 file modified
fixture_test.go (+13/-3)
To merge this branch: bzr merge lp:~sergiusens/gocheck/expected_panic_regex_in_tests
Reviewer Review Type Date Requested Status
Gustavo Niemeyer 2013-12-19 Pending
Review via email: mp+199661@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

86. By Sergio Schvezov on 2013-12-19

Fixing expected regex for panics

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'fixture_test.go'
2--- fixture_test.go 2013-03-02 02:47:45 +0000
3+++ fixture_test.go 2013-12-19 13:56:41 +0000
4@@ -59,7 +59,9 @@
5 ".*gocheck_test.go:[0-9]+\n" +
6 " in FixtureHelper.trace\n" +
7 ".*gocheck_test.go:[0-9]+\n" +
8- " in FixtureHelper.Test1\n$"
9+ " in FixtureHelper.Test1\n" +
10+ ".+:[0-9]+\n" +
11+ " in call[0-9]+\n$"
12
13 c.Check(output.value, Matches, expected)
14 }
15@@ -84,6 +86,8 @@
16 " in FixtureHelper.trace\n" +
17 ".*gocheck_test.go:[0-9]+\n" +
18 " in FixtureHelper.SetUpTest\n" +
19+ ".+:[0-9]+\n" +
20+ " in call[0-9]+\n" +
21 "\n-+\n" +
22 "PANIC: gocheck_test\\.go:[0-9]+: " +
23 "FixtureHelper\\.Test1\n\n" +
24@@ -114,6 +118,8 @@
25 " in FixtureHelper.trace\n" +
26 ".*gocheck_test.go:[0-9]+\n" +
27 " in FixtureHelper.TearDownTest\n" +
28+ ".+:[0-9]+\n" +
29+ " in call[0-9]+\n" +
30 "\n-+\n" +
31 "PANIC: gocheck_test\\.go:[0-9]+: " +
32 "FixtureHelper\\.Test1\n\n" +
33@@ -140,7 +146,9 @@
34 ".*gocheck_test.go:[0-9]+\n" +
35 " in FixtureHelper.trace\n" +
36 ".*gocheck_test.go:[0-9]+\n" +
37- " in FixtureHelper.SetUpSuite\n$"
38+ " in FixtureHelper.SetUpSuite\n" +
39+ ".+:[0-9]+\n" +
40+ " in call[0-9]+\n$"
41
42 c.Check(output.value, Matches, expected)
43 }
44@@ -168,7 +176,9 @@
45 ".*gocheck_test.go:[0-9]+\n" +
46 " in FixtureHelper.trace\n" +
47 ".*gocheck_test.go:[0-9]+\n" +
48- " in FixtureHelper.TearDownSuite\n$"
49+ " in FixtureHelper.TearDownSuite\n" +
50+ ".+:[0-9]+\n" +
51+ " in call[0-9]+\n$"
52
53 c.Check(output.value, Matches, expected)
54 }

Subscribers

People subscribed via source and target branches