Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 633bcc73940865b7ef9a552a3f24c86a9a99c4b4 1 parent 50980e8
Matt Robinson authored
Showing with 23 additions and 24 deletions.
  1. +1 −2  README
  2. +1 −1  {spec → lib}/drivers.sh
  3. +1 −1  {spec → lib}/setup.sh
  4. 0  {spec → lib}/util.sh
  5. +1 −1  spec/file_hello_world_spec.sh
  6. +1 −1  spec/puppet_agent_should_connect_to_the_master_spec.sh
  7. +1 −1  spec/puppet_master_should_open_a_port_spec.sh
  8. +1 −1  spec/resource/host/should_query_all_spec.sh
  9. +1 −1  spec/resource/host/should_query_spec.sh
  10. +1 −1  spec/resource/package/should_install_spec.sh
  11. +1 −1  spec/resource/service/should_list_all_enabled_spec.sh
  12. +1 −1  spec/resource/user/should_create_with_gid_spec.sh
  13. +1 −1  spec/settings_section_deprecation_spec.sh
  14. +1 −1  spec/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.sh
  15. +1 −1  spec/ticket_3656_requiring_multiple_resources.sh
  16. +1 −1  spec/ticket_3961_puppet_ca_should_produce_certs_spec.sh
  17. +1 −1  spec/ticket_4059_ralsh_can_change_settings_spec.sh
  18. +1 −1  spec/ticket_4090_store_reports.sh
  19. +1 −1  spec/ticket_4149_parseonly_should_not_fail_spec.sh
  20. +1 −1  spec/ticket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources_spec.sh
  21. +1 −1  spec/ticket_4220_autoloading_init.pp_from_a_module_spec.sh
  22. +1 −1  spec/ticket_4233_resource_with_a_newline_spec.sh
  23. +1 −1  spec/ticket_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement_spec.sh
  24. +1 −1  spec/ticket_4293_define_and_use_a_define_within_a_class_spec.sh
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)
View
2  spec/drivers.sh → lib/drivers.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source spec/util.sh
+source lib/util.sh
driver_standalone() {
execute_manifest() {
View
2  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
View
0  spec/util.sh → lib/util.sh
File renamed without changes
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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':
View
2  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
View
2  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
View
2  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'
View
2  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
View
2  ...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
View
2  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'
View
2  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.
View
2  ...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') {
View
2  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"
Please sign in to comment.
Something went wrong with that request. Please try again.