Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
a2bd93f6
Commit
a2bd93f6
authored
14 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Patches
Plain Diff
Test-runner: fix alignment. No code changes.
parent
f7bbe259
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/admin.py
+17
-17
17 additions, 17 deletions
test/admin.py
test/test-run.py
+3
-3
3 additions, 3 deletions
test/test-run.py
with
20 additions
and
20 deletions
test/admin.py
+
17
−
17
View file @
a2bd93f6
...
...
@@ -39,21 +39,21 @@ class Options:
"""
Add all program options, with their defaults.
"""
parser
=
argparse
.
ArgumentParser
(
description
=
"
Tarantool regression test suite client.
"
)
description
=
"
Tarantool regression test suite client.
"
)
parser
.
add_argument
(
"
--host
"
,
dest
=
'
host
'
,
metavar
=
"
host
"
,
default
=
"
localhost
"
,
help
=
"
Host to connect to. Default: localhost
"
)
"
--host
"
,
dest
=
'
host
'
,
metavar
=
"
host
"
,
default
=
"
localhost
"
,
help
=
"
Host to connect to. Default: localhost
"
)
parser
.
add_argument
(
"
--port
"
,
dest
=
"
port
"
,
default
=
33015
,
help
=
"
Server port to connect to. Default: 33015
"
)
"
--port
"
,
dest
=
"
port
"
,
default
=
33015
,
help
=
"
Server port to connect to. Default: 33015
"
)
self
.
args
=
parser
.
parse_args
()
...
...
@@ -64,8 +64,7 @@ class Connection:
self
.
is_connected
=
False
def
connect
(
self
):
self
.
socket
=
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
)
self
.
socket
=
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
)
self
.
socket
.
connect
((
self
.
host
,
self
.
port
))
self
.
is_connected
=
True
...
...
@@ -104,11 +103,12 @@ def main():
with
Connection
(
options
.
args
.
host
,
options
.
args
.
port
)
as
con
:
res_sep
=
"
r>
"
for
line
in
iter
(
sys
.
stdin
.
readline
,
""
):
if
line
.
find
(
res_sep
)
==
0
:
continue
print
line
,
output
=
con
.
execute
(
line
)
if
line
.
find
(
res_sep
)
==
0
:
continue
print
line
,
output
=
con
.
execute
(
line
)
print
res_sep
,
string
.
join
(
output
.
split
(
"
\n
"
),
"
\n
"
+
res_sep
)
return
0
except
(
RuntimeError
,
socket
.
error
)
as
e
:
print
"
Fatal error:
"
,
repr
(
e
)
...
...
This diff is collapsed.
Click to expand it.
test/test-run.py
+
3
−
3
View file @
a2bd93f6
...
...
@@ -62,8 +62,8 @@ class Options:
"""
Handle options of test-runner
"""
def
__init__
(
self
):
"""
Add all program options, with their defaults. We assume
that the program is started from the directory where it is
located
"""
that the program is started from the directory where it is
located
"""
parser
=
argparse
.
ArgumentParser
(
description
=
"
Tarantool regression test suite front-end.
\
...
...
@@ -403,7 +403,7 @@ def main():
options
=
Options
()
try
:
print
"
Started
"
,
""
.
join
(
sys
.
argv
)
print
"
Started
"
,
"
"
.
join
(
sys
.
argv
)
suites
=
[]
for
suite_name
in
options
.
args
.
suites
:
suites
.
append
(
TestSuite
(
suite_name
,
options
.
args
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment