Permalink
Browse files

Move spec/{drivers, setup, util} to lib

  • Loading branch information...
Matt Robinson
Matt Robinson committed Jul 26, 2010
1 parent 50980e8 commit 633bcc73940865b7ef9a552a3f24c86a9a99c4b4
View
3 README
@@ -18,8 +18,7 @@ An example is provided which assumes puppet and facter exist in /opt/puppetlabs
Writing specifications:
* specification scripts should be written in BASH
* Expect the current working directory to be where the Makefile lives.
-* The script should source spec/util.sh
-* The script should source spec/setup.sh
+* The script should source lib/setup.sh
* They should return $EXIT_FAIL on a test failure.
* The should return 0 or $EXIT_OK on test success.
* Any other exit code is treated as a testing error (not failure)
@@ -1,5 +1,5 @@
#!/bin/bash
-source spec/util.sh
+source lib/util.sh
driver_standalone() {
execute_manifest() {
@@ -1,5 +1,5 @@
#!/bin/bash
-source spec/drivers.sh
+source lib/drivers.sh
env_driver
source local_setup.sh
File renamed without changes.
@@ -1,7 +1,7 @@
#!/bin/bash
set -u
-source spec/setup.sh
+source lib/setup.sh
set -e
execute_manifest <<PP
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
start_puppet_master
@@ -1,7 +1,7 @@
#!/bin/bash
#
set -u
-source spec/setup.sh
+source lib/setup.sh
PORT=18140
@@ -1,5 +1,5 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
backup_file /etc/hosts
@@ -1,5 +1,5 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
backup_file /etc/hosts
@@ -3,7 +3,7 @@
set -e
set -u
-source spec/setup.sh
+source lib/setup.sh
if ! which rpm ; then NOT_APPLICABLE ; fi
@@ -9,7 +9,7 @@
# be marked pending.
set -u
-source spec/setup.sh
+source lib/setup.sh
set -e
# count ralshes enabled services
@@ -3,7 +3,7 @@
# verifies that puppet resource creates a user and assigns the correct group
#
set -u
-source spec/setup.sh
+source lib/setup.sh
set -e
# preconditions
@@ -5,7 +5,7 @@
set -u
-source spec/setup.sh
+source lib/setup.sh
driver_master_and_agent_locally_using_old_executables
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
puppet kick hostname1 | tee /tmp/puppet-kick-$$.txt
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
execute_manifest <<'PP'
notify { 'foo':
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
puppet cert --trace --generate test01.domain.tld --ssldir=/tmp/puppet-ssl-$$ --debug --verbose
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
puppet resource host example.com ensure=present ip=127.0.0.1 target=/tmp/hosts-$$ --trace
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
driver_master_and_agent_locally_using_old_executables
puppet_conf <<'CONF'
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
driver_standalone_using_files
execute_manifest --parseonly <<PP
@@ -18,7 +18,7 @@
set -e
set -u
-source spec/setup.sh
+source lib/setup.sh
driver_standalone_using_files
execute_manifest <<PP
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
use_driver "master_and_agent_locally"
module_file "ssh/manifests/init.pp" <<'INIT'
@@ -7,7 +7,7 @@
set -u
-source spec/setup.sh
+source lib/setup.sh
# JJM We expect 2.6.0rc3 to return an error
# and 2.6.0 final to not return an error line.
@@ -6,7 +6,7 @@
set -e
set -u
-source spec/setup.sh
+source lib/setup.sh
if execute_manifest <<'EOF'
$foo='abc'
if $foo != regsubst($foo,'abc','def') {
@@ -10,7 +10,7 @@
#
set -u
-source spec/setup.sh
+source lib/setup.sh
OUTPUT="/tmp/puppet-$$.out"

0 comments on commit 633bcc7

Please sign in to comment.