Merge lp:~jtv/gwacl/dispatcher-fixture into lp:gwacl

[Jeroen T. Vermeulen]

Extract x509DispatcherFixture from X509SessionSuite, so we don't re-run the session tests wherever we use the fixture.

The management-API test suite embeds the x509 session test suite. This is a bit silly, in that now the x509 session tests get run both as a stand-alone test suite *and* when the management-API tests are run. I noticed this when I got double failures.

The purpose of the duplication was reuse of the facility for injecting test doubles into the x509 dispatcher. This is really a test fixture, so I extracted one.

Jeroen

[Julian Edwards (julian-edwards)]

review: Approve

[Julian Edwards (julian-edwards)]

Attempt to merge into lp:gwacl failed due to conflicts:

text conflict in managementapi_test.go

[Julian Edwards (julian-edwards)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Julian Edwards (julian-edwards)]

Attempt to merge into lp:gwacl failed due to conflicts:

text conflict in x509session_test.go

[lp:~jtv/gwacl/dispatcher-fixture]

63. By Jeroen T. Vermeulen on 2013-03-26

Merge trunk, resolve conflict.

=== modified file 'managementapi_test.go'
--- managementapi_test.go	2013-03-26 08:52:35 +0000
+++ managementapi_test.go	2013-03-26 09:56:22 +0000
@@ -9,7 +9,7 @@
 )
 
 type managementAPISuite struct {
-    X509SessionSuite
+    x509DispatcherFixture
 }
 
 var _ = Suite(&managementAPISuite{})

=== modified file 'x509session_test.go'
--- x509session_test.go	2013-03-26 06:50:50 +0000
+++ x509session_test.go	2013-03-26 09:56:22 +0000
@@ -17,8 +17,29 @@
     "time"
 )
 
+// x509DispatcherFixture records the current x509 dispatcher before a test,
+// and restores it after.  This gives your test the freedom to replace the
+// dispatcher with test doubles, using any of the rig*Dispatcher functions.
+// Call the fixture's SetUpTest/TearDownTest methods before/after your test,
+// or if you have no other setup/teardown methods, just embed the fixture in
+// your test suite.
+type x509DispatcherFixture struct {
+    oldDispatcher func(*x509Session, *x509Request) (*x509Response, error)
+}
+
+func (suite *x509DispatcherFixture) SetUpTest(c *C) {
+    // Record the original X509 dispatcher.  Will be restored at the end of
+    // each test.
+    suite.oldDispatcher = _X509Dispatcher
+}
+
+func (suite *x509DispatcherFixture) TearDownTest(c *C) {
+    // Restore old dispatcher.
+    _X509Dispatcher = suite.oldDispatcher
+}
+
 type X509SessionSuite struct {
-    oldDispatcher func(*x509Session, *x509Request) (*x509Response, error)
+    x509DispatcherFixture
 }
 
 var _ = Suite(&X509SessionSuite{})
@@ -53,17 +74,6 @@
     }
 }
 
-func (suite *X509SessionSuite) SetUpTest(c *C) {
-    // Record the original X509 dispatcher.  Will be restored at the end of
-    // each test.
-    suite.oldDispatcher = _X509Dispatcher
-}
-
-func (suite *X509SessionSuite) TearDownTest(c *C) {
-    // Restore old dispatcher.
-    _X509Dispatcher = suite.oldDispatcher
-}
-
 // Create a cert and pem file in a temporary dir in /tmp and return the
 // names of the files.  The caller is responsible for cleaning up the files.
 func makeX509Certificate() (string, string) {