Enable wrongly disabled tests and delete empty tests

test/integration/api/info.bats

@@ -19,8 +19,8 @@ function teardown() {
 
 @test "docker info - details" {
 	# details in docker info were introduced in docker 1.10, skip older version without
-	run docker info
-	if [[ "${output}" != *"Paused:"* ]]; then
+	run docker --version
+	if [[ "${output}" == "Docker version 1.9"* ]]; then
 		skip
 	fi
 

test/integration/api/inspect.bats

@@ -24,7 +24,7 @@ function teardown() {
 	[ "${#lines[@]}" -eq 2 ]
 	[[ "${lines[1]}" == *"test_container"* ]]
 
-	# inspect and verify 
+	# inspect and verify
 	run docker_swarm inspect test_container
 	[ "$status" -eq 0 ]
 	[[ "${output}" == *"NetworkSettings"* ]]
@@ -42,9 +42,6 @@ function teardown() {
 }
 
 @test "docker inspect --format" {
-	# FIXME: Broken in docker master. See #717
-	skip
-
 	start_docker_with_busybox 2
 	swarm_manage
 	# run container

test/integration/api/run.bats

@@ -157,10 +157,11 @@ function teardown() {
 	[[ "${output}" == *"10.0.0.42"* ]]
 }
 
-@test "docker run --net-alias" {
-	# docker run --net-alias is introduced in docker 1.10, skip older version without --net-alias
+@test "docker run --network-alias" {
+	# docker run --net-alias was introduced in docker 1.10, and later renamed to
+	# --network-alias. Only run tests for the latter.
 	run docker run --help
-	if [[ "${output}" != *"--net-alias"* ]]; then
+	if [[ "${output}" != *"--network-alias"* ]]; then
 		skip
 	fi
 
@@ -169,7 +170,7 @@ function teardown() {
 
 	docker_swarm network create -d bridge testn
 
-	docker_swarm run --name testc --net testn -d --net-alias=testa busybox sh
+	docker_swarm run --name testc --net testn -d --network-alias=testa busybox sh
 	run docker_swarm inspect testc
 	[[ "${output}" == *"testa"* ]]
 }

test/integration/discovery/token.bats

@@ -24,8 +24,8 @@ DISCOVERY=""
 #	token_cleanup
 #}
 
-# docker hub token service is down. This is not the recommended way of
-# discovery. It's not prioritized on Docker hub. Disable the test for now.
+# This is not the recommended way of discovery. It's not
+# prioritized on Docker hub. Disable the test for now.
 @test "token discovery: recover engines" {
 skip
 
@@ -42,8 +42,8 @@ skip
 	retry 5 1 discovery_check_swarm_info
 }
 
-# docker hub token service is down. Since this is not the recommended way of
-# discovery. It's not prioritized on Docker hub. Disable the test for now.
+# This is not the recommended way of discovery. It's not
+# prioritized on Docker hub. Disable the test for now.
 @test "token discovery: watch for changes" {
 skip