Update dh_installsystemd tests

The history of tests is a little confusing. At one point, Niels updated
dh_installsystemd to install units to usr d70caa69c64b ("Make systemd
tools use usr/lib"), but he reverted that later 3083286de05f ("Revert
change to install systemd services in usr/lib"). That revert was
incomplete leaving the confusing "lib -> usr/lib" comments.

The "with both no-empty" case is now redundant after the reversion and
I'm therefore deleting it. As for the others, replace the comment with a
more useful one.

Signed-off-by: Helmut Grohne <helmut@subdivi.de>

1 files changed, 2 insertions, 16 deletions

diff --git a/t/dh_installsystemd/dh_installsystemd.t b/t/dh_installsystemd/dh_installsystemd.t
index 9521b398..cb1a3dab 100755
--- a/t/dh_installsystemd/dh_installsystemd.t
+++ b/t/dh_installsystemd/dh_installsystemd.t
@@ -105,6 +105,7 @@ each_compat_subtest {
 	unit_is_started('foo', 'foo2', 0);
 	ok(run_dh_tool('dh_clean'));
 
+	# Install unit directly below /lib
 	make_path('debian/foo/lib/systemd/system/');
 	copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/foo2.service');
 	ok(run_dh_tool('dh_installsystemd'));
@@ -116,7 +117,7 @@ each_compat_subtest {
 	unit_is_started('foo', 'foo2', 1);
 	ok(run_dh_tool('dh_clean'));
 
-	# lib -> usr/lib
+	# Install unit directly below /usr/lib
 	make_path('debian/foo/usr/lib/systemd/system/');
 	copy_file('debian/foo2.service', 'debian/foo/usr/lib/systemd/system/foo2.service');
 	ok(run_dh_tool('dh_installsystemd'));
@@ -128,21 +129,6 @@ each_compat_subtest {
 	unit_is_started('foo', 'foo2', 1);
 	ok(run_dh_tool('dh_clean'));
 
-	# lib -> usr/lib with both no-empty (if we ever suport that)
-	make_path('debian/foo/lib/systemd/system/');
-	make_path('debian/foo/lib/systemd/system/');
-	copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/foo2.service');
-	copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/bar.service');
-	ok(run_dh_tool('dh_installsystemd'));
-	ok(-e 'debian/foo/lib/systemd/system/bar.service');
-	ok(-e 'debian/foo/lib/systemd/system/foo2.service');
-	ok(find_script('foo', 'postinst'));
-	unit_is_enabled('foo', 'foo', 1);
-	unit_is_started('foo', 'foo', 1);
-	unit_is_enabled('foo', 'foo2', 1);
-	unit_is_started('foo', 'foo2', 1);
-	ok(run_dh_tool('dh_clean'));
-
 	make_path('debian/foo/lib/systemd/system/');
 	copy_file('debian/foo2.service', 'debian/foo/lib/systemd/system/foo2.service');
 	ok(run_dh_tool('dh_installsystemd', '--no-start'));