diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-07-18 15:01:13 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-07-18 15:01:13 +0000 |
commit | c643d1df7ef2d1d46ee82e409ea87efc5c701176 (patch) | |
tree | ee57a8aa1b8fbdba5ec177dad330b6a55189b569 | |
parent | 875e17d524166ded41d59cd2703d7cc8f6e1e45d (diff) | |
parent | 8cb0e9879a51c1f12b8ab8d9dcb076cd145e7375 (diff) | |
download | definitions-c643d1df7ef2d1d46ee82e409ea87efc5c701176.tar.gz |
Merge branch 'liw/fix-localhost-in-tests'
Reviewed-by: Daniel Silverstone
-rw-r--r-- | morphlib/plugins/expand_repo_plugin.py | 2 | ||||
-rw-r--r-- | morphlib/plugins/update_gits_plugin.py | 2 | ||||
-rwxr-xr-x | tests/update-gits-chunk.script | 2 | ||||
-rwxr-xr-x | tests/update-gits-stratum.script | 2 | ||||
-rwxr-xr-x | tests/update-gits-submodules.script | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/morphlib/plugins/expand_repo_plugin.py b/morphlib/plugins/expand_repo_plugin.py index 4c8ab126..721287ca 100644 --- a/morphlib/plugins/expand_repo_plugin.py +++ b/morphlib/plugins/expand_repo_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/morphlib/plugins/update_gits_plugin.py b/morphlib/plugins/update_gits_plugin.py index e3d7a81b..46686391 100644 --- a/morphlib/plugins/update_gits_plugin.py +++ b/morphlib/plugins/update_gits_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/update-gits-chunk.script b/tests/update-gits-chunk.script index 288438ec..3f5b3e71 100755 --- a/tests/update-gits-chunk.script +++ b/tests/update-gits-chunk.script @@ -25,7 +25,7 @@ set -eu git daemon --port=9419 --pid-file="$DATADIR/git.pid" --reuseaddr \ --export-all --base-path="$DATADIR" 2> /dev/null & trap 'kill $(cat "$DATADIR/git.pid")' INT TERM ERR -REPO_ALIAS='test=git://localhost:9419/%s#git://localhost:9419/%s' +REPO_ALIAS='test=git://127.0.0.1:9419/%s#git://127.0.0.1:9419/%s' # Create an empty commit in a chunk repository cd "$DATADIR/chunk-repo" diff --git a/tests/update-gits-stratum.script b/tests/update-gits-stratum.script index 112a8973..6ad95cd9 100755 --- a/tests/update-gits-stratum.script +++ b/tests/update-gits-stratum.script @@ -25,7 +25,7 @@ set -eu git daemon --port=9419 --pid-file="$DATADIR/git.pid" --reuseaddr \ --export-all --base-path="$DATADIR" 2> /dev/null & trap 'kill $(cat "$DATADIR/git.pid")' INT TERM ERR -REPO_ALIAS='test=git://localhost:9419/%s#git://localhost:9419/%s' +REPO_ALIAS='test=git://127.0.0.1:9419/%s#git://127.0.0.1:9419/%s' # Create an empty commit in a chunk repository cd "$DATADIR/chunk-repo" diff --git a/tests/update-gits-submodules.script b/tests/update-gits-submodules.script index 66d35897..557c29e7 100755 --- a/tests/update-gits-submodules.script +++ b/tests/update-gits-submodules.script @@ -25,7 +25,7 @@ set -eu git daemon --port=9419 --pid-file="$DATADIR/git.pid" --reuseaddr \ --export-all --base-path="$DATADIR" 2> /dev/null & trap 'kill $(cat "$DATADIR/git.pid")' INT TERM ERR -REPO_ALIAS='test=git://localhost:9419/%s#git://localhost:9419/%s' +REPO_ALIAS='test=git://127.0.0.1:9419/%s#git://127.0.0.1:9419/%s' # Create a repo to use as a submodule submodule="$DATADIR/submodule-repo" |