Permalink
Browse files

Merge branch 'master' of github.com:puppetlabs/puppet-acceptance

  • Loading branch information...
2 parents 4bccaee + 738476b commit ea3089400da68c93e16fd81a5892a78290a3bcaf @jes5199 jes5199 committed Jul 27, 2010
Showing with 91 additions and 92 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/apply/classes/should_allow_param_class_default_override_spec.sh
  6. +1 −1 spec/apply/classes/should_allow_param_class_defaults_spec.sh
  7. +1 −1 spec/apply/classes/should_allow_param_class_post_inclusion_spec.sh
  8. +1 −1 spec/apply/classes/should_allow_param_classes_spec.sh
  9. +1 −1 spec/apply/classes/should_allow_param_override_spec.sh
  10. +1 −1 spec/apply/classes/should_allow_param_undef_override.sh
  11. +1 −1 spec/apply/classes/should_include_resources_from_class_spec.sh
  12. +1 −1 spec/apply/classes/should_not_auto_include_resources_from_class_spec.sh
  13. +1 −1 spec/apply/conditionals/should_evaluate_else_spec.sh
  14. +1 −1 spec/apply/conditionals/should_evaluate_elsif_spec.sh
  15. +1 −1 spec/apply/conditionals/should_evaluate_empty_spec.sh
  16. +1 −1 spec/apply/conditionals/should_evaluate_false_spec.sh
  17. +1 −1 spec/apply/conditionals/should_evaluate_if_spec.sh
  18. +1 −1 spec/apply/conditionals/should_evaluate_strings_true_spec.sh
  19. +1 −1 spec/apply/conditionals/should_evaluate_undef_spec.sh
  20. +1 −1 spec/apply/hashes/should_not_reassign_spec.sh
  21. +1 −1 spec/apply/hashes/should_suport_title_arrays.sh
  22. +1 −1 spec/apply/hashes/should_support_array_values_spec.sh
  23. +1 −1 spec/apply/hashes/should_support_attr_assignment_spec.sh
  24. +1 −1 spec/apply/hashes/should_support_hash_for_conditionals_spec.sh
  25. +1 −1 spec/apply/hashes/should_support_indices_spec.sh
  26. +1 −1 spec/apply/hashes/should_support_titles.sh
  27. +1 −1 spec/apply/virtual/should_realize_complex_query_spec.sh
  28. +1 −1 spec/apply/virtual/should_realize_many_spec.sh
  29. +1 −1 spec/apply/virtual/should_realize_query_array_spec.sh
  30. +1 −1 spec/apply/virtual/should_realize_query_spec.sh
  31. +1 −1 spec/apply/virtual/should_realize_spec.sh
  32. +1 −1 spec/doc/should_print_function_reference.sh
  33. +1 −1 spec/doc/ticket_4120_cannot_generate_type_reference.sh
  34. +1 −1 spec/file_hello_world_spec.sh
  35. +1 −1 spec/puppet_agent_should_apply_its_catalog.sh
  36. +1 −1 spec/puppet_agent_should_connect_to_the_master_spec.sh
  37. +1 −1 spec/puppet_apply_a_file_should_create_a_file_and_report_the_md5_spec.sh
  38. +1 −1 spec/puppet_apply_should_show_a_notice_spec.sh
  39. +1 −1 spec/puppet_master_help_should_mention_puppet_master_spec.sh
  40. +1 −1 spec/puppet_master_help_should_not_error_spec.sh
  41. +1 −1 spec/puppet_master_should_open_a_port_spec.sh
  42. +1 −1 spec/resource/cron/should_create_cron_spec.sh
  43. +1 −1 spec/resource/cron/should_match_existing_spec.sh
  44. +1 −1 spec/resource/cron/should_remove_cron_spec.sh
  45. +1 −1 spec/resource/cron/should_remove_matching_spec.sh
  46. +1 −1 spec/resource/cron/should_update_existing_spec.sh
  47. +1 −1 spec/resource/file/should_create_directory_spec.sh
  48. +1 −1 spec/resource/file/should_create_empty_spec.sh
  49. +1 −1 spec/resource/file/should_create_symlink_spec.sh
  50. +1 −1 spec/resource/file/should_remove_dir_spec.sh
  51. +1 −1 spec/resource/file/should_remove_file_spec.sh
  52. +1 −1 spec/resource/group/should_create_spec.sh
  53. +1 −1 spec/resource/group/should_create_with_gid_spec.sh
  54. +1 −1 spec/resource/group/should_destroy_spec.sh
  55. +1 −1 spec/resource/group/should_modify_gid_spec.sh
  56. +1 −1 spec/resource/group/should_not_create_existing_spec.sh
  57. +1 −1 spec/resource/group/should_not_destoy_unexisting_spec.sh
  58. +1 −1 spec/resource/group/should_query_all_spec.sh
  59. +1 −1 spec/resource/group/should_query_spec.sh
  60. +1 −1 spec/resource/host/should_create_aliases_spec.sh
  61. +1 −1 spec/resource/host/should_create_spec.sh
  62. +1 −1 spec/resource/host/should_destroy_spec.sh
  63. +1 −1 spec/resource/host/should_modify_alias_spec.sh
  64. +1 −1 spec/resource/host/should_modify_ip_spec.sh
  65. +1 −1 spec/resource/host/should_not_create_existing_spec.sh
  66. +1 −1 spec/resource/host/should_query_all_spec.sh
  67. +1 −1 spec/resource/host/should_query_spec.sh
  68. +1 −1 spec/resource/host/ticket_4131_should_not_create_without_ip_spec.sh
  69. +1 −1 spec/resource/package/should_install_spec.sh
  70. +1 −1 spec/resource/service/should_list_all_enabled_spec.sh
  71. +1 −1 spec/resource/service/ticket_4124_should_list_all_disabled_spec.sh
  72. +1 −1 spec/resource/user/should_create_spec.sh
  73. +1 −1 spec/resource/user/should_create_with_gid_spec.sh
  74. +1 −1 spec/resource/user/should_destroy_spec.sh
  75. +1 −1 spec/resource/user/should_modify_gid_spec.sh
  76. +1 −1 spec/resource/user/should_not_create_existing_spec.sh
  77. +1 −1 spec/resource/user/should_not_destoy_unexisting_spec.sh
  78. +1 −1 spec/resource/user/should_query_all_spec.sh
  79. +1 −1 spec/resource/user/should_query_spec.sh
  80. +1 −1 spec/settings_section_deprecation_spec.sh
  81. +1 −1 spec/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.sh
  82. +1 −1 spec/ticket_3656_requiring_multiple_resources.sh
  83. +1 −1 spec/ticket_3961_puppet_ca_should_produce_certs_spec.sh
  84. +1 −1 spec/ticket_4059_ralsh_can_change_settings_spec.sh
  85. +1 −1 spec/ticket_4090_store_reports.sh
  86. +1 −1 spec/ticket_4110_puppet_apply_should_not_create_a_user_that_already_exists_spec.sh
  87. +1 −1 spec/ticket_4149_parseonly_should_not_fail_spec.sh
  88. +1 −1 spec/ticket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources_spec.sh
  89. +1 −1 spec/ticket_4220_autoloading_init.pp_from_a_module_spec.sh
  90. +1 −1 spec/ticket_4233_resource_with_a_newline_spec.sh
  91. +1 −1 spec/ticket_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement_spec.sh
  92. +1 −1 spec/ticket_4293_define_and_use_a_define_within_a_class_spec.sh
View
@@ -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.
@@ -2,7 +2,7 @@ set -e
#
# we are testing that resources declared in a class
# can be applied with an include statement
-source local_setup.sh
+source lib/setup.sh
OUTFILE=/tmp/class_param_use-$$
puppet apply <<PP | tee $OUTFILE
class x(\$y, \$z='2') {
@@ -5,7 +5,7 @@ set -u
# we are testing that resources declared in a class
# can be applied with an include statement
-source local_setup.sh
+source lib/setup.sh
OUTFILE=/tmp/class_param_use-$$
puppet apply <<PP | tee $OUTFILE
class x(\$y, \$z='2') {
@@ -6,7 +6,7 @@ set -e
# we are testing that resources declared in a class
# can be applied with an include statement
-source local_setup.sh
+source lib/setup.sh
OUTFILE=/tmp/class_param_use-$$
puppet apply <<PP | tee $OUTFILE
class x(\$y, \$z) {
@@ -3,7 +3,7 @@ set -u
set -e
# we are testing that resources declared in a class
# can be applied with an include statement
-source local_setup.sh
+source lib/setup.sh
OUTFILE=/tmp/class_param_use-$$
puppet apply <<PP | tee $OUTFILE
class x(\$y, \$z) {
@@ -4,7 +4,7 @@ set -e
#
# we are testing that resources declared in a class
# can be applied with an include statement
-source local_setup.sh
+source lib/setup.sh
OUTFILE=/tmp/class_param_use-$$
puppet apply <<PP | tee $OUTFILE
class parent {
@@ -3,7 +3,7 @@ set -u
set -e
# we are testing that resources declared in a class
# can be applied with an include statement
-source local_setup.sh
+source lib/setup.sh
OUTFILE=/tmp/class_undef_override_out-$$
echo 'hello world!' > /tmp/class_undef_override_test-$$
puppet apply <<PP | tee $OUTFILE
@@ -3,7 +3,7 @@ set -u
set -e
# we are testing that resources declared in a class
# can be applied with an include statement
-source local_setup.sh
+source lib/setup.sh
puppet apply <<PP | tee /tmp/class_include-$$
class x {
@@ -1,7 +1,7 @@
#!/bin/bash
set -u
set -e
-source local_setup.sh
+source lib/setup.sh
# test that resource declared in classes are not applied without include
puppet apply <<PP | tee /tmp/class_not_include-$$
@@ -1,7 +1,7 @@
#!/bin/bash
set -u
set -e
-source local_setup.sh
+source lib/setup.sh
OUTFILE="/tmp/spec-$$.log"
@@ -2,7 +2,7 @@
set -u
set -e
-source local_setup.sh
+source lib/setup.sh
OUTFILE="/tmp/spec-$$.log"
@@ -6,7 +6,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
OUTFILE="/tmp/spec-$$.log"
@@ -2,7 +2,7 @@
#
# test that false evaluates to false
#
-source local_setup.sh
+source lib/setup.sh
OUTFILE="/tmp/spec-$$.log"
@@ -1,6 +1,6 @@
#!/bin/bash
-source local_setup.sh
+source lib/setup.sh
OUTFILE="/tmp/spec-$$.log"
@@ -2,7 +2,7 @@
#
# test that the string 'false' evaluates to true
#
-source local_setup.sh
+source lib/setup.sh
OUTFILE="/tmp/spec-$$.log"
@@ -1,5 +1,5 @@
#!/bin/bash
-source local_setup.sh
+source lib/setup.sh
OUTFILE="/tmp/spec-$$.log"
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
# hash reassignment should fail
! puppet apply <<PP | grep "Assigning to the hash 'my_hash' with an existing key 'one'"
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
puppet apply <<PP | grep notice | grep if
if( 1 == 1) {
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
puppet apply <<PP | grep notice | grep if
if( 1 == 1) {
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
puppet apply <<PP | grep notice | grep if
if( 1 == 1) {
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
puppet apply <<PP | grep notice | grep if
if( 1 == 1) {
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
puppet apply <<PP | grep notice | grep if
if( 1 == 1) {
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
puppet apply <<PP | grep notice | grep if
if( 1 == 1) {
@@ -6,7 +6,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
HOSTFILE=/tmp/hosts-$$
# precondition:
@@ -5,7 +5,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
HOSTFILE=/tmp/hosts-$$
# precondition:
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
HOSTFILE=/tmp/hosts-$$
# precondition:
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
HOSTFILE=/tmp/hosts-$$
# precondition:
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
HOSTFILE=/tmp/hosts-$$
# precondition:
@@ -1,5 +1,5 @@
#!/bin/bash
-. ../../local_setup.sh
+source lib/setup.sh
puppet doc -r function | grep 'Function Reference'
@@ -1,5 +1,5 @@
#!/bin/bash
-. ../../local_setup.sh
+source lib/setup.sh
puppet doc -r type
@@ -1,7 +1,7 @@
#!/bin/bash
set -u
-source spec/setup.sh
+source lib/setup.sh
set -e
execute_manifest <<PP
@@ -2,7 +2,7 @@
source spec/drivers.sh
driver_master_and_agent_locally
-source local_setup.sh
+source lib/setup.sh
execute_manifest <<PP
file{'/tmp/hello.$$.txt': content => 'hello world'}
@@ -1,6 +1,6 @@
#!/bin/bash
-source spec/setup.sh
+source lib/setup.sh
start_puppet_master
@@ -1,6 +1,6 @@
set -e
-source local_setup.sh
+source lib/setup.sh
rm -f /tmp/hello.world.$$.txt
@@ -1,3 +1,3 @@
-source local_setup.sh
+source lib/setup.sh
echo "notice 'Hello World'" | puppet apply | grep 'notice:.*Hello World'
@@ -1,2 +1,2 @@
-source local_setup.sh
+source lib/setup.sh
puppet master --help | grep -w 'puppet master'
@@ -1,2 +1,2 @@
-source local_setup.sh
+source lib/setup.sh
puppet master --help
@@ -1,7 +1,7 @@
#!/bin/bash
#
set -u
-source spec/setup.sh
+source lib/setup.sh
PORT=18140
@@ -3,7 +3,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
# precondition:
# this cron test unit is not portable
@@ -3,7 +3,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
# precondition:
# this cron test unit is not portable
@@ -3,7 +3,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
# precondition:
# this cron test unit is not portable
@@ -3,7 +3,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
# precondition:
# this cron test unit is not portable
@@ -3,7 +3,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
# precondition:
# this cron test unit is not portable
@@ -4,7 +4,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
DIRNAME="/tmp/test-$$"
@@ -4,7 +4,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
FILENAME="/tmp/$0-$$"
@@ -4,7 +4,7 @@
set -e
set -u
-source local_setup.sh
+source lib/setup.sh
FILENAME="/tmp/spec-$$-link"
FILENAME2="/tmp/spec-$$-file"
Oops, something went wrong.

0 comments on commit ea30894

Please sign in to comment.