Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
95937a53
Commit
95937a53
authored
Mar 22, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix duplicate calls to superclass setUp.
Missed in
4df3c4e1
.
parent
1a5a0ba4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
neo/tests/master/testElectionHandler.py
neo/tests/master/testElectionHandler.py
+2
-4
No files found.
neo/tests/master/testElectionHandler.py
View file @
95937a53
...
@@ -53,7 +53,7 @@ class MasterClientElectionTestBase(NeoUnitTestBase):
...
@@ -53,7 +53,7 @@ class MasterClientElectionTestBase(NeoUnitTestBase):
class
MasterClientElectionTests
(
MasterClientElectionTestBase
):
class
MasterClientElectionTests
(
MasterClientElectionTestBase
):
def
setUp
(
self
):
def
setUp
(
self
):
NeoUnitTestBase
.
setUp
(
self
)
super
(
MasterClientElectionTests
,
self
).
setUp
(
)
# create an application object
# create an application object
config
=
self
.
getMasterConfiguration
(
master_number
=
1
)
config
=
self
.
getMasterConfiguration
(
master_number
=
1
)
self
.
app
=
Application
(
config
)
self
.
app
=
Application
(
config
)
...
@@ -68,7 +68,6 @@ class MasterClientElectionTests(MasterClientElectionTestBase):
...
@@ -68,7 +68,6 @@ class MasterClientElectionTests(MasterClientElectionTestBase):
# apply monkey patches
# apply monkey patches
self
.
_addPacket
=
ClientConnection
.
_addPacket
self
.
_addPacket
=
ClientConnection
.
_addPacket
ClientConnection
.
_addPacket
=
_addPacket
ClientConnection
.
_addPacket
=
_addPacket
super
(
MasterClientElectionTests
,
self
).
setUp
()
def
_tearDown
(
self
,
success
):
def
_tearDown
(
self
,
success
):
# restore patched methods
# restore patched methods
...
@@ -212,7 +211,7 @@ class MasterClientElectionTests(MasterClientElectionTestBase):
...
@@ -212,7 +211,7 @@ class MasterClientElectionTests(MasterClientElectionTestBase):
class
MasterServerElectionTests
(
MasterClientElectionTestBase
):
class
MasterServerElectionTests
(
MasterClientElectionTestBase
):
def
setUp
(
self
):
def
setUp
(
self
):
NeoUnitTestBase
.
setUp
(
self
)
super
(
MasterServerElectionTests
,
self
).
setUp
(
)
# create an application object
# create an application object
config
=
self
.
getMasterConfiguration
(
master_number
=
1
)
config
=
self
.
getMasterConfiguration
(
master_number
=
1
)
self
.
app
=
Application
(
config
)
self
.
app
=
Application
(
config
)
...
@@ -231,7 +230,6 @@ class MasterServerElectionTests(MasterClientElectionTestBase):
...
@@ -231,7 +230,6 @@ class MasterServerElectionTests(MasterClientElectionTestBase):
# apply monkey patches
# apply monkey patches
self
.
_addPacket
=
ClientConnection
.
_addPacket
self
.
_addPacket
=
ClientConnection
.
_addPacket
ClientConnection
.
_addPacket
=
_addPacket
ClientConnection
.
_addPacket
=
_addPacket
super
(
MasterServerElectionTests
,
self
).
setUp
()
def
_tearDown
(
self
,
success
):
def
_tearDown
(
self
,
success
):
NeoUnitTestBase
.
_tearDown
(
self
,
success
)
NeoUnitTestBase
.
_tearDown
(
self
,
success
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment