Merge pull request #3 from dottedmag/master

Fixes for broken packages testcases

Author: Maciej Patucha

tests/acceptance/07_packages/001.cf

@@ -19,10 +19,10 @@ classes:
   "mpm_declared" not => strcmp(getenv("MOCK_PACKAGE_MANAGER", "65535"), "");
 
 vars:
-  temp_declared::
+  mpm_declared::
     "pm" string => getenv("MOCK_PACKAGE_MANAGER", "65535");
 
-  !temp_declared::
+  !mpm_declared::
     "pm" string => concat(dirname("$(G.cwd)/$(this.promise_filename)"), "/../mock-package-manager");
 }
 

tests/acceptance/07_packages/002.cf

@@ -19,10 +19,10 @@ classes:
   "mpm_declared" not => strcmp(getenv("MOCK_PACKAGE_MANAGER", "65535"), "");
 
 vars:
-  temp_declared::
+  mpm_declared::
     "pm" string => getenv("MOCK_PACKAGE_MANAGER", "65535");
 
-  !temp_declared::
+  !mpm_declared::
     "pm" string => concat(dirname("$(G.cwd)/$(this.promise_filename)"), "/../mock-package-manager");
 }
 

tests/acceptance/07_packages/003.cf

@@ -19,10 +19,10 @@ classes:
   "mpm_declared" not => strcmp(getenv("MOCK_PACKAGE_MANAGER", "65535"), "");
 
 vars:
-  temp_declared::
+  mpm_declared::
     "pm" string => getenv("MOCK_PACKAGE_MANAGER", "65535");
 
-  !temp_declared::
+  !mpm_declared::
     "pm" string => concat(dirname("$(G.cwd)/$(this.promise_filename)"), "/../mock-package-manager");
 }
 

tests/acceptance/07_packages/004.cf

@@ -19,10 +19,10 @@ classes:
   "mpm_declared" not => strcmp(getenv("MOCK_PACKAGE_MANAGER", "65535"), "");
 
 vars:
-  temp_declared::
+  mpm_declared::
     "pm" string => getenv("MOCK_PACKAGE_MANAGER", "65535");
 
-  !temp_declared::
+  !mpm_declared::
     "pm" string => concat(dirname("$(G.cwd)/$(this.promise_filename)"), "/../mock-package-manager");
 }
 

tests/acceptance/07_packages/005.cf

@@ -19,10 +19,10 @@ classes:
   "mpm_declared" not => strcmp(getenv("MOCK_PACKAGE_MANAGER", "65535"), "");
 
 vars:
-  temp_declared::
+  mpm_declared::
     "pm" string => getenv("MOCK_PACKAGE_MANAGER", "65535");
 
-  !temp_declared::
+  !mpm_declared::
     "pm" string => concat(dirname("$(G.cwd)/$(this.promise_filename)"), "/../mock-package-manager");
 }
 

tests/acceptance/07_packages/006.cf

@@ -19,10 +19,10 @@ classes:
   "mpm_declared" not => strcmp(getenv("MOCK_PACKAGE_MANAGER", "65535"), "");
 
 vars:
-  temp_declared::
+  mpm_declared::
     "pm" string => getenv("MOCK_PACKAGE_MANAGER", "65535");
 
-  !temp_declared::
+  !mpm_declared::
     "pm" string => concat(dirname("$(G.cwd)/$(this.promise_filename)"), "/../mock-package-manager");
 }
 

tests/acceptance/Makefile.am

@@ -26,7 +26,7 @@ endif
 EXTRA_DIST = default.cf.sub testall
 
 TESTS = testall
-TESTS_ENVIRONMENT = env AGENT=$(abs_top_builddir)/src/cf-agent MOCK_PACKAGE_MANAGER=$(abs_top_builddir)/tests/acceptance/workdir/mock-package-manager
+TESTS_ENVIRONMENT = env AGENT=$(abs_top_builddir)/src/cf-agent MOCK_PACKAGE_MANAGER=$(abs_top_builddir)/tests/acceptance/mock-package-manager
 
 dist-hook:
 	tar -c -f - [0-9]* --exclude '*svn*' | tar -x -C $(distdir) -f -