Skip to content
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

8282007: Assorted enhancements to jpackage testing framework #7502

Closed
wants to merge 7 commits into from
+562 −326
Closed

8282007: Assorted enhancements to jpackage testing framework #7502

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6cbe5da
Assorted fixes and enhancements to jpackage testing framework
alexeysemenyukoracle Feb 16, 2022
9c706ab
Don't use TKit.assertZZZ to validate test setup correctness. Throw ex…
alexeysemenyukoracle Feb 16, 2022
77383dc
macOS bugix
alexeysemenyukoracle Feb 16, 2022
a43e5e0
8282007: Assorted enhancements to jpackage testing framework
alexeysemenyukoracle Feb 16, 2022
895997a
Trailing whitespace removed
alexeysemenyukoracle Feb 16, 2022
8ce156d
Don't fail if requested to uninstall not installed Debian package
alexeysemenyukoracle Feb 16, 2022
c890c8a
Copyright years fixed
alexeysemenyukoracle Feb 17, 2022
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
5 changes: 4 additions & 1 deletion test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
View file
Original file line number Diff line number Diff line change
@@ -182,7 +182,10 @@ static PackageHandlers createDebPackageHandlers() {
};
deb.uninstallHandler = cmd -> {
cmd.verifyIsOfType(PackageType.LINUX_DEB);
Executor.of("sudo", "dpkg", "-r", getPackageName(cmd)).execute();
var packageName = getPackageName(cmd);
String script = String.format("! dpkg -s %s || sudo dpkg -r %s",
packageName, packageName);
Executor.of("sh", "-c", script).execute();
};
deb.unpackHandler = (cmd, destinationDir) -> {
cmd.verifyIsOfType(PackageType.LINUX_DEB);