Skip to content

Fixes for broken packages testcases #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patuchov merged 2 commits into from
Feb 27, 2012
Merged

Fixes for broken packages testcases #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
640bcaf
Fix wrong class name in tests, breaking ./testall
dottedmag Feb 27, 2012
457a902
Fix the path to mock_package_manager for 'make check'
dottedmag Feb 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/acceptance/07_packages/001.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/07_packages/002.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/07_packages/003.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/07_packages/004.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/07_packages/005.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/07_packages/006.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -