Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
607
Issues
607
List
Boards
Labels
Service Desk
Milestones
Merge Requests
114
Merge Requests
114
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
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
ISC Open Source Projects
BIND
Commits
99491639
Commit
99491639
authored
Feb 07, 2019
by
Evan Hunt
3
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjust style, match test to other tests
parent
a159675f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
17 deletions
+18
-17
bin/python/isc/coverage.py.in
bin/python/isc/coverage.py.in
+3
-3
bin/tests/system/coverage/13-dotted-dotless/expect
bin/tests/system/coverage/13-dotted-dotless/expect
+7
-0
bin/tests/system/coverage/setup.sh
bin/tests/system/coverage/setup.sh
+5
-0
bin/tests/system/coverage/tests.sh
bin/tests/system/coverage/tests.sh
+2
-14
util/copyrights
util/copyrights
+1
-0
No files found.
bin/python/isc/coverage.py.in
View file @
99491639
...
...
@@ -188,9 +188,9 @@ def parse_args():
if args.filename and len(args.zone) > 1:
fatal("ERROR: -f can only be used with one zone.")
# strip trailing dots
args.zone = [x[:-1] if
len(x) > 1 and x[-1] == '.'
else x
for x in args.zone]
# strip trailing dots
if any
args.zone = [x[:-1] if
(len(x) > 1 and x[-1] == '.')
else x
for x in args.zone]
# convert from time arguments to seconds
try:
...
...
bin/tests/system/coverage/13-dotted-dotless/expect
0 → 100644
View file @
99491639
args="-z -m2h"
warn=0
error=0
ok=2
retcode=0
match=
zones="one.example. two.example"
bin/tests/system/coverage/setup.sh
View file @
99491639
...
...
@@ -132,3 +132,8 @@ ksk1=`$KEYGEN -q -K $dir -a rsasha1 -3fk example.com`
dir
=
12-ksk-deletion
ksk1
=
`
$KEYGEN
-q
-K
$dir
-f
KSK
-a
8
-b
2048
-I
+40d
-D
+40d example.com
`
ksk2
=
`
$KEYGEN
-q
-K
$dir
-S
$ksk1
.key example.com
`
# Test 13: check names with/without dots at the end
dir
=
13-dotted-dotless
zsk1
=
`
$KEYGEN
-q
-K
$dir
-a
rsasha256 one.example
`
zsk2
=
`
$KEYGEN
-q
-K
$dir
-a
rsasha256 two.example
`
bin/tests/system/coverage/tests.sh
View file @
99491639
...
...
@@ -32,9 +32,9 @@ ret=0
for
dir
in
[
0-9][0-9]-
*
;
do
ret
=
0
echo_i
"
$dir
"
args
=
warn
=
error
=
ok
=
retcode
=
match
=
args
=
warn
=
error
=
ok
=
retcode
=
match
=
zones
=
.
$dir
/expect
$COVERAGE
$args
-K
$dir
example.com
>
coverage.
$n
2>&1
$COVERAGE
$args
-K
$dir
${
zones
:-
example
.com
}
>
coverage.
$n
2>&1
# check that return code matches expectations
found
=
$?
...
...
@@ -81,17 +81,5 @@ for dir in [0-9][0-9]-*; do
status
=
`
expr
$status
+
$ret
`
done
dir
=
dotted-dotless
[
-d
$dir
]
||
mkdir
$dir
echo_i
"
$dir
"
zsk1
=
`
$KEYGEN
-q
-K
$dir
-a
rsasha256 one.example
`
zsk2
=
`
$KEYGEN
-q
-K
$dir
-a
rsasha256 two.example
`
$COVERAGE
-K
$dir
one.example. two.example
>
coverage.
$n
2>&1
grep
one.example coverage.
$n
>
/dev/null 2>&1
||
ret
=
1
grep
two.example coverage.
$n
>
/dev/null 2>&1
||
ret
=
1
n
=
`
expr
$n
+ 1
`
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
echo_i
"exit status:
$status
"
[
$status
-eq
0
]
||
exit
1
util/copyrights
View file @
99491639
...
...
@@ -482,6 +482,7 @@
./bin/tests/system/coverage/11-cutoff/README X 2014,2018,2019
./bin/tests/system/coverage/11-cutoff/expect X 2014,2018,2019
./bin/tests/system/coverage/12-ksk-deletion/expect X 2018,2019
./bin/tests/system/coverage/13-dotted-dotless/expect X 2019
./bin/tests/system/coverage/clean.sh SH 2013,2014,2016,2018,2019
./bin/tests/system/coverage/setup.sh SH 2013,2014,2016,2017,2018,2019
./bin/tests/system/coverage/tests.sh SH 2013,2014,2016,2018,2019
...
...
Evan Hunt
@each
mentioned in commit
ddcd3b61
·
Feb 08, 2019
mentioned in commit
ddcd3b61
mentioned in commit ddcd3b61be269fadedca60aeeedd7f4882bfef06
Toggle commit list
Evan Hunt
@each
mentioned in commit
599f10e0
·
Feb 08, 2019
mentioned in commit
599f10e0
mentioned in commit 599f10e09106371af22d548752714f101209034b
Toggle commit list
Evan Hunt
@each
mentioned in commit
d3a962db
·
Feb 08, 2019
mentioned in commit
d3a962db
mentioned in commit d3a962db1ebe1c9442eb2e8a8d4b4a3a638878c7
Toggle commit list
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