Add support for links, rework tests.

README.md

@@ -29,6 +29,7 @@ At present docker-rerun supports a small number of commonly used arguments:
     * Commands (trailing arguments)
     * Environment variables (-e/--env)
     * Labels (-l/--label)
+    * Links (--link)
     * Names (--name)
     * Networks (--net)
     * Port publications (-p)
@@ -40,7 +41,7 @@ At present docker-rerun supports a small number of commonly used arguments:
 
 Many other command line arguments:
 
-    * Linking and aliases
+    * Network aliases
     * Permissions and policies
     * Advanced networking options
 

docker-rerun

@@ -135,6 +135,20 @@ def handle_labels(container):
             container.args.append('--label=%s' % key)
 
 
+def handle_links(container):
+    """Copies the link (--link) arguments."""
+    name = container.info['Name']
+    links = container.info['HostConfig']['Links'] or []
+    for link in links:
+        (target, alias) = link.split(':')
+        target = target[1:]
+        alias = alias[len(name) + 1:]
+        if alias == target:
+            container.args.append('--link=%s' % target)
+        else:
+            container.args.append('--link=%s:%s' % (target, alias))
+
+
 def handle_name(container):
     """Copies the name (--name) argument."""
     # Trim the leading / off the name. They're equivalent from docker's point

requirements.txt

@@ -1,4 +1,3 @@
 nose
-nose_parameterized
 pylint
 

test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 import subprocess
-from nose_parameterized import parameterized
+from nose.tools import with_setup
 
 
 def _run(cmd):
@@ -10,28 +10,48 @@ def _run(cmd):
                     stderr=subprocess.DEVNULL)
 
 
-@parameterized([
-    ['docker', 'run', '--name=test123', '-d', 'hello-world'],
-    ['docker', 'run', '--name=test123', '-d', 'hello-world:latest'],
-    ['docker', 'run', '--name=test123', '-d', 'hello-world', '/hello', 'world...'],
-    ['docker', 'run', '--env=PATH=/root', '--env=Z=X', '--name=test123', '-d', 'hello-world'],
-    ['docker', 'run', '--env=FOO=bar baz', '--name=test123', '-d', 'hello-world'],
-    ['docker', 'run', '--name=test123', '--restart=always', '-d', 'hello-world'],
-    ['docker', 'run', '--name=test123', '--restart=on-failure:10', '-d', 'hello-world'],
-    ['docker', 'run', '--name=test123', '--net=host', '-d', 'hello-world'],
-    ['docker', 'run', '--name=test123', '-d', '-p=127.0.0.1:443:443', '-p=127.0.0.1::1336/udp', 'hello-world'],
-    ['docker', 'run', '--name=test123', '-d', '-p=443', 'hello-world'],
-    ['docker', 'run', '--name=test123', '--user=root', '-d', 'hello-world', '/hello', 'foobar'],
-    ['docker', 'run', '--name=test123', '--net=host', '--user=root:root', '-d', 'hello-world'],
-    ['docker', 'run', '--name=test123', '--volume=/dev/null:/null', '--volume=/dev/urandom:/mnt/random', '-d', 'hello-world'],
-    ['docker', 'run', '--label=com.example=123 456', '--name=test123', '-d', 'hello-world'],
-    ['docker', 'run', '--label=com.example.1', '--label=com.example.2=345', '--name=test123', '-d', 'hello-world'],
-])
-def test_command_matches(*command):
+def setup():
+    _run(['docker', 'run', '--name=testA', '-d', 'hello-world'])
+    _run(['docker', 'run', '--name=testB', '-d', 'hello-world'])
+
+
+def teardown():
+    _run(['docker', 'rm', '-f', 'testA'])
+    _run(['docker', 'rm', '-f', 'testB'])
+
+
+def setup_each():
+    _run(['docker', 'rm', '-f', 'test123'])
+
+
+def teardown_each():
     _run(['docker', 'rm', '-f', 'test123'])
+
+
+@with_setup(setup, teardown)
+def test_command_matches():
+    yield check, ['docker', 'run', '--name=test123', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '-d', 'hello-world:latest']
+    yield check, ['docker', 'run', '--name=test123', '-d', 'hello-world', '/hello', 'world...']
+    yield check, ['docker', 'run', '--env=PATH=/root', '--env=Z=X', '--name=test123', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--env=FOO=bar baz', '--name=test123', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '--restart=always', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '--restart=on-failure:10', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '--net=host', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '-d', '-p=127.0.0.1:443:443', '-p=127.0.0.1::1336/udp', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '-d', '-p=443', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '--user=root', '-d', 'hello-world', '/hello', 'foobar']
+    yield check, ['docker', 'run', '--name=test123', '--net=host', '--user=root:root', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--name=test123', '--volume=/dev/null:/null', '--volume=/dev/urandom:/mnt/random', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--label=com.example=123 456', '--name=test123', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--label=com.example.1', '--label=com.example.2=345', '--name=test123', '-d', 'hello-world']
+    yield check, ['docker', 'run', '--link=testA:bar', '--link=testB', '--name=test123', '-d', 'hello-world']
+
+
+@with_setup(setup_each, teardown_each)
+def check(command):
     _run(command)
     output = subprocess.check_output(['./docker-rerun', '--dry-run', 'test123'])
     output = output.decode('utf-8').strip().splitlines()
-    assert output[3] == ' '.join(command)
-    _run(['docker', 'rm', '-f', 'test123'])
+    assert output[3] == ' '.join(command), 'Expected "%s" but got "%s"' % (' '.join(command), output[3])