summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2013-06-02 12:21:10 -0700
committerDaniil Baturin <daniil@baturin.org>2013-06-02 12:21:10 -0700
commit40a069ceede0db6f034ddf77c6a145c790342c9e (patch)
tree4009dc048536e5445ab55ded3aab4be90bdcf97b
parent5b519f36c2ff6e70b86939bcda74635640459b65 (diff)
parent4c4cbeb46b7fe46f330ecd96c618fe9943e975f3 (diff)
downloadipaddrcheck-40a069ceede0db6f034ddf77c6a145c790342c9e.tar.gz
ipaddrcheck-40a069ceede0db6f034ddf77c6a145c790342c9e.zip
Merge branch 'master' of github.com:SO3Group/ipaddrcheck
-rwxr-xr-xtests/integration_tests.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/integration_tests.sh b/tests/integration_tests.sh
index ef323d4..c9eebca 100755
--- a/tests/integration_tests.sh
+++ b/tests/integration_tests.sh
@@ -132,7 +132,7 @@ for address in \
${ipv6_cidr_postitive[0]} \
$string
do
- assert_raises "$IPADDRCHECK --is-any-cidr $address" 1
+ assert_raises "$IPADDRCHECK --is-any-single $address" 1
done
@@ -141,7 +141,7 @@ for address in \
${ipv4_single_positive[*]} \
${ipv4_cidr_positive[*]}
do
- assert_raises "$IPADDRCHECK --is-any-cidr $address" 0
+ assert_raises "$IPADDRCHECK --is-ipv4 $address" 0
done
for address in \
@@ -151,14 +151,14 @@ for address in \
${ipv6_cidr_positive[0]} \
$string
do
- assert_raises "$IPADDRCHECK --is-any-cidr $address" 1
+ assert_raises "$IPADDRCHECK --is-ipv4 $address" 1
done
# --is-ipv4-cidr
for address in \
${ipv4_cidr_positive[*]}
do
- assert_raises "$IPADDRCHECK --is-any-cidr $address" 0
+ assert_raises "$IPADDRCHECK --is-ipv4-cidr $address" 0
done
for address in \
@@ -168,14 +168,14 @@ for address in \
${ipv6_cidr_positive[0]} \
$string
do
- assert_raises "$IPADDRCHECK --is-any-cidr $address" 1
+ assert_raises "$IPADDRCHECK --is-ipv4-cidr $address" 1
done
# --is-ipv4-single
for address in \
${ipv4_single_positive[*]}
do
- assert_raises "$IPADDRCHECK --is-any-cidr $address" 0
+ assert_raises "$IPADDRCHECK --is-ipv4-single $address" 0
done
for address in \
@@ -185,7 +185,7 @@ for address in \
${ipv6_cidr_positive[0]} \
$string
do
- assert_raises "$IPADDRCHECK --is-any-cidr $address" 1
+ assert_raises "$IPADDRCHECK --is-ipv4-single $address" 1
done
# --is-ipv4-host