Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
neoppod
Commits
de302d89
Commit
de302d89
authored
Aug 20, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix indentation.
parent
dd556379
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
neo/lib/util.py
neo/lib/util.py
+5
-5
neo/scripts/runner.py
neo/scripts/runner.py
+1
-1
neo/tests/functional/__init__.py
neo/tests/functional/__init__.py
+1
-1
neo/tests/threaded/__init__.py
neo/tests/threaded/__init__.py
+3
-3
No files found.
neo/lib/util.py
View file @
de302d89
...
@@ -76,11 +76,11 @@ def getConnectorFromAddress(address):
...
@@ -76,11 +76,11 @@ def getConnectorFromAddress(address):
def
parseNodeAddress
(
address
,
port_opt
=
None
):
def
parseNodeAddress
(
address
,
port_opt
=
None
):
if
address
[:
1
]
==
'['
:
if
address
[:
1
]
==
'['
:
(
host
,
port
)
=
address
[
1
:].
split
(
']'
)
(
host
,
port
)
=
address
[
1
:].
split
(
']'
)
if
port
[:
1
]
==
':'
:
if
port
[:
1
]
==
':'
:
port
=
port
[
1
:]
port
=
port
[
1
:]
else
:
else
:
port
=
port_opt
port
=
port_opt
elif
address
.
count
(
':'
)
==
1
:
elif
address
.
count
(
':'
)
==
1
:
(
host
,
port
)
=
address
.
split
(
':'
)
(
host
,
port
)
=
address
.
split
(
':'
)
else
:
else
:
...
...
neo/scripts/runner.py
View file @
de302d89
...
@@ -174,7 +174,7 @@ class NeoTestRunner(unittest.TestResult):
...
@@ -174,7 +174,7 @@ class NeoTestRunner(unittest.TestResult):
success
=
self
.
testsRun
-
len
(
self
.
errors
)
-
len
(
self
.
failures
)
success
=
self
.
testsRun
-
len
(
self
.
errors
)
-
len
(
self
.
failures
)
add_status
(
'Directory'
,
self
.
temp_directory
)
add_status
(
'Directory'
,
self
.
temp_directory
)
if
self
.
testsRun
:
if
self
.
testsRun
:
add_status
(
'Status'
,
'%.3f%%'
%
(
success
*
100.0
/
self
.
testsRun
))
add_status
(
'Status'
,
'%.3f%%'
%
(
success
*
100.0
/
self
.
testsRun
))
for
var
in
os
.
environ
.
iterkeys
():
for
var
in
os
.
environ
.
iterkeys
():
if
var
.
startswith
(
'NEO_TEST'
):
if
var
.
startswith
(
'NEO_TEST'
):
add_status
(
var
,
os
.
environ
[
var
])
add_status
(
var
,
os
.
environ
[
var
])
...
...
neo/tests/functional/__init__.py
View file @
de302d89
...
@@ -138,7 +138,7 @@ class ChildException(KeyboardInterrupt):
...
@@ -138,7 +138,7 @@ class ChildException(KeyboardInterrupt):
"""Re-raise wrapped exception"""
"""Re-raise wrapped exception"""
type
,
value
,
tb
=
self
.
args
type
,
value
,
tb
=
self
.
args
if
type
is
KeyboardInterrupt
:
if
type
is
KeyboardInterrupt
:
sys
.
exit
(
1
)
sys
.
exit
(
1
)
raise
type
,
value
,
tb
raise
type
,
value
,
tb
...
...
neo/tests/threaded/__init__.py
View file @
de302d89
...
@@ -555,9 +555,9 @@ class NEOCluster(object):
...
@@ -555,9 +555,9 @@ class NEOCluster(object):
kw
=
dict
(
cluster
=
weak_self
,
getReplicas
=
replicas
,
getAdapter
=
adapter
,
kw
=
dict
(
cluster
=
weak_self
,
getReplicas
=
replicas
,
getAdapter
=
adapter
,
getPartitions
=
partitions
,
getReset
=
clear_databases
)
getPartitions
=
partitions
,
getReset
=
clear_databases
)
if
upstream
is
not
None
:
if
upstream
is
not
None
:
self
.
upstream
=
weakref
.
proxy
(
upstream
)
self
.
upstream
=
weakref
.
proxy
(
upstream
)
kw
.
update
(
getUpstreamCluster
=
upstream
.
name
,
kw
.
update
(
getUpstreamCluster
=
upstream
.
name
,
getUpstreamMasters
=
parseMasterList
(
upstream
.
master_nodes
))
getUpstreamMasters
=
parseMasterList
(
upstream
.
master_nodes
))
self
.
master_list
=
[
MasterApplication
(
address
=
x
,
**
kw
)
self
.
master_list
=
[
MasterApplication
(
address
=
x
,
**
kw
)
for
x
in
master_list
]
for
x
in
master_list
]
if
db_list
is
None
:
if
db_list
is
None
:
...
...
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