Fixing #615 (subclasses with similar names) by getting rid of the class "type" and "fqname", and instead using "classname" everywhere. You should no longer see unqualified class/definition names anywhere. Also, rewriting how snippet tests work, to avoid creating all of the files, since the point was the parsing tests, not functional tests.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2458 980ebf18-57e1-0310-9a29-db15c13687c0

3 files changed, 13 insertions, 16 deletions

diff --git a/test/data/snippets/dirchmod b/test/data/snippets/dirchmod
deleted file mode 100644
index 15421ea10..000000000
--- a/test/data/snippets/dirchmod
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Id$
-
-file {
-    "/tmp/dirchmodtesta": ensure => directory;
-    "/tmp/dirchmodtesta/testing": ensure => file
-}
-
-File["/tmp/dirchmodtesta"] { mode => 644, recurse => true }
-
-file {
-    "/tmp/dirchmodtestb": ensure => directory;
-    "/tmp/dirchmodtestb/testing": ensure => file
-}
-
-File["/tmp/dirchmodtestb"] { mode => 600, recurse => true }
diff --git a/test/data/snippets/failmissingexecpath.pp b/test/data/snippets/failmissingexecpath.pp
index aae1a09fa..b03875547 100644
--- a/test/data/snippets/failmissingexecpath.pp
+++ b/test/data/snippets/failmissingexecpath.pp
@@ -2,7 +2,8 @@ define distloc($path) {
     file { "/tmp/exectesting1":
         ensure => file
     }
-    exec { "touch $path":
+    exec { "exectest":
+        command => "touch $path",
         subscribe => File["/tmp/exectesting1"],
         refreshonly => true
     }
diff --git a/test/data/snippets/subclass_name_duplication.pp b/test/data/snippets/subclass_name_duplication.pp
new file mode 100755
index 000000000..10f1d75ed
--- /dev/null
+++ b/test/data/snippets/subclass_name_duplication.pp
@@ -0,0 +1,11 @@
+#!/usr/bin/env puppet
+
+class one::fake {
+    file { "/tmp/subclass_name_duplication1": ensure => present }
+}
+
+class two::fake {
+    file { "/tmp/subclass_name_duplication2": ensure => present }
+}
+
+include one::fake, two::fake