Replace 'push-url' and 'pull-url' options with just 'url'sam/canonical-push-urls

This is possible now that the SSH protocol can redirect to the
appropriate pull URL.

Note that this commit makes no attempt at backwards compatibility.
Everthing will break!

1 files changed, 4 insertions, 8 deletions

diff --git a/tests/frontend/pull.py b/tests/frontend/pull.py
index 07d664c5f..116bc9e49 100644
--- a/tests/frontend/pull.py
+++ b/tests/frontend/pull.py
@@ -53,14 +53,12 @@ def test_push_pull(cli, tmpdir, datafiles, user_url, project_url, override_url):
     # Configure artifact share
     cli.configure({
         'artifacts': {
-            'pull-url': user_url,
-            'push-url': user_url,
+            'url': user_url,
         },
         'projects': {
             'test': {
                 'artifacts': {
-                    'pull-url': override_url,
-                    'push-url': override_url,
+                    'url': override_url,
                 }
             }
         }
@@ -71,8 +69,7 @@ def test_push_pull(cli, tmpdir, datafiles, user_url, project_url, override_url):
         project_config = _yaml.load(project_conf_file)
         project_config.update({
             'artifacts': {
-                'pull-url': project_url,
-                'push-url': project_url,
+                'url': project_url,
             }
         })
         _yaml.dump(_yaml.node_sanitize(project_config), filename=project_conf_file)
@@ -137,8 +134,7 @@ def test_push_pull_all(cli, tmpdir, datafiles):
             'pushers': 1
         },
         'artifacts': {
-            'pull-url': share.repo,
-            'push-url': share.repo,
+            'url': share.repo,
         }
     })