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

blkperl · Jul 26, 2010 · 633bcc7 · 633bcc7
1 parent 50980e8
commit 633bcc7
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 24 deletions.
diff --git a/README b/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 lib/setup.sh
-* The script should source spec/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)

diff --git a/spec/drivers.sh → lib/drivers.sh b/spec/drivers.sh → lib/drivers.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source spec/util.sh
+source lib/util.sh
 
 driver_standalone() {
   execute_manifest() {

diff --git a/spec/setup.sh → lib/setup.sh b/spec/setup.sh → lib/setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source spec/drivers.sh
+source lib/drivers.sh
 env_driver
 source local_setup.sh
diff --git a/spec/util.sh → lib/util.sh b/spec/util.sh → lib/util.sh
diff --git a/spec/file_hello_world_spec.sh b/spec/file_hello_world_spec.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -u
-source spec/setup.sh
+source lib/setup.sh
 set -e
 
 execute_manifest <<PP

diff --git a/spec/puppet_agent_should_connect_to_the_master_spec.sh b/spec/puppet_agent_should_connect_to_the_master_spec.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source spec/setup.sh
+source lib/setup.sh
 
 start_puppet_master
 

diff --git a/spec/puppet_master_should_open_a_port_spec.sh b/spec/puppet_master_should_open_a_port_spec.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 set -u
-source spec/setup.sh
+source lib/setup.sh
 
 PORT=18140
 

diff --git a/spec/resource/host/should_query_all_spec.sh b/spec/resource/host/should_query_all_spec.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
 
 backup_file /etc/hosts
 

diff --git a/spec/resource/host/should_query_spec.sh b/spec/resource/host/should_query_spec.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
 
 backup_file /etc/hosts
 

diff --git a/spec/resource/package/should_install_spec.sh b/spec/resource/package/should_install_spec.sh
@@ -3,7 +3,7 @@
 set -e
 set -u
 
-source spec/setup.sh
+source lib/setup.sh
 
 if ! which rpm ; then NOT_APPLICABLE ; fi
 

diff --git a/spec/resource/service/should_list_all_enabled_spec.sh b/spec/resource/service/should_list_all_enabled_spec.sh
@@ -9,7 +9,7 @@
 # be marked pending.
 
 set -u
-source spec/setup.sh
+source lib/setup.sh
 set -e
 
 # count ralshes enabled services

diff --git a/spec/resource/user/should_create_with_gid_spec.sh b/spec/resource/user/should_create_with_gid_spec.sh
@@ -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

diff --git a/spec/settings_section_deprecation_spec.sh b/spec/settings_section_deprecation_spec.sh
@@ -5,7 +5,7 @@
 
 set -u
 
-source spec/setup.sh
+source lib/setup.sh
 
 driver_master_and_agent_locally_using_old_executables
 

diff --git a/spec/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.sh b/spec/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source spec/setup.sh
+source lib/setup.sh
 
 puppet kick hostname1 | tee /tmp/puppet-kick-$$.txt
 

diff --git a/spec/ticket_3656_requiring_multiple_resources.sh b/spec/ticket_3656_requiring_multiple_resources.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source spec/setup.sh
+source lib/setup.sh
 
 execute_manifest <<'PP'
 notify { 'foo':

diff --git a/spec/ticket_3961_puppet_ca_should_produce_certs_spec.sh b/spec/ticket_3961_puppet_ca_should_produce_certs_spec.sh
@@ -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
 

diff --git a/spec/ticket_4059_ralsh_can_change_settings_spec.sh b/spec/ticket_4059_ralsh_can_change_settings_spec.sh
@@ -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
 

diff --git a/spec/ticket_4090_store_reports.sh b/spec/ticket_4090_store_reports.sh
@@ -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'

diff --git a/spec/ticket_4149_parseonly_should_not_fail_spec.sh b/spec/ticket_4149_parseonly_should_not_fail_spec.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source spec/setup.sh
+source lib/setup.sh
 driver_standalone_using_files
 
 execute_manifest --parseonly <<PP

diff --git a/...ket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources_spec.sh b/...ket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources_spec.sh
@@ -18,7 +18,7 @@
 set -e
 set -u
 
-source spec/setup.sh
+source lib/setup.sh
 driver_standalone_using_files
 
 execute_manifest <<PP

diff --git a/spec/ticket_4220_autoloading_init.pp_from_a_module_spec.sh b/spec/ticket_4220_autoloading_init.pp_from_a_module_spec.sh
@@ -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'

diff --git a/spec/ticket_4233_resource_with_a_newline_spec.sh b/spec/ticket_4233_resource_with_a_newline_spec.sh
@@ -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.

diff --git a/...t_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement_spec.sh b/...t_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement_spec.sh
@@ -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') {

diff --git a/spec/ticket_4293_define_and_use_a_define_within_a_class_spec.sh b/spec/ticket_4293_define_and_use_a_define_within_a_class_spec.sh
@@ -10,7 +10,7 @@
 #
 
 set -u
-source spec/setup.sh
+source lib/setup.sh
 
 OUTPUT="/tmp/puppet-$$.out"