summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2015-06-13 19:08:26 +0300
committerLars Wirzenius <liw@liw.fi>2015-06-13 19:08:26 +0300
commit8ca7b4e3ea442ab83fde26651f3e5dc149bed578 (patch)
treef96554e69c03ce12ca93e74b32a5e29d6f3ceffa /doc
parentc60eb397380ae881e6a7b3815e5a493b64268dc1 (diff)
downloadick-8ca7b4e3ea442ab83fde26651f3e5dc149bed578.tar.gz
Fix assumption that localhost can be used as target
Diffstat (limited to 'doc')
-rw-r--r--doc/040-simple.yarn8
-rw-r--r--doc/070-pipeline.yarn2
-rw-r--r--doc/900-implements.yarn9
3 files changed, 15 insertions, 4 deletions
diff --git a/doc/040-simple.yarn b/doc/040-simple.yarn
index 6e9607c..85922f4 100644
--- a/doc/040-simple.yarn
+++ b/doc/040-simple.yarn
@@ -6,6 +6,12 @@ scenario testing language.
SCENARIO build simple project
+For running these tests, the caller must set the `ICK_TEST_TARGET`
+environment variable to an address that can be reached by ssh and
+where `sudo pbuilder` can be run.
+
+ GIVEN the ICK_TEST_TARGET variable is set
+
First of all, we need to have a project we build. We call the project
FOO. For this example, it can be empty, since we don't actually need
to build anything.
@@ -20,7 +26,7 @@ have ssh access to it, preferably without having to type a key
passphrase or a login password all the time.
GIVEN an ick file KITTEN.ick
- AND KITTEN.ick uses localhost as a target
+ AND KITTEN.ick uses $ICK_TEST_TARGET as a target
AND KITTEN.ick builds FOO using project type shell
AND KITTEN.ick builds FOO from repository FOO
AND KITTEN.ick builds FOO from branch master
diff --git a/doc/070-pipeline.yarn b/doc/070-pipeline.yarn
index d7262a9..7a7e85d 100644
--- a/doc/070-pipeline.yarn
+++ b/doc/070-pipeline.yarn
@@ -13,7 +13,7 @@ First of all, we need a git repository with some source code.
Then we need an Ick file.
AND an ick file foo.ick
- AND foo.ick uses localhost as a target
+ AND foo.ick uses $ICK_TEST_TARGET as a target
AND foo.ick builds foo using project type debian
AND foo.ick builds foo from repository foo
AND foo.ick builds foo from branch master
diff --git a/doc/900-implements.yarn b/doc/900-implements.yarn
index 55fe8f1..1cf3a80 100644
--- a/doc/900-implements.yarn
+++ b/doc/900-implements.yarn
@@ -5,6 +5,11 @@ be actually executed. Surprise! You didn't know you were reading a
test suite! If you're only interested in this document as a manual,
you can skip this chapter.
+## Checking that the target address is set
+
+ IMPLEMENTS GIVEN the (.+) variable is set
+ env | grep -F "$MATCH_1"
+
## Git repository setup
Set up git repository. We add a dummy README file so that the
@@ -27,9 +32,9 @@ Create a basic ick file. Add the state automatically.
Add a target to an ick file.
- IMPLEMENTS GIVEN (.+).ick uses (.+) as a target
+ IMPLEMENTS GIVEN (.+).ick uses \$ICK_TEST_TARGET as a target
"$SRCDIR/yaml-add" "$DATADIR/$MATCH_1.ick" \
- targets "$MATCH_2" address "$MATCH_2"
+ targets test_target address "$ICK_TEST_TARGET"
Set project type for a project.