Merge ~lvoytek/ubuntu/+source/net-tools:fix-lp1679346-add-dep8 into ubuntu/+source/net-tools:ubuntu/devel

[Lena Voytek]

Added some DEP-8 tests to the package. One tests the hostname command and the other tests ifconfig.
I'm going to need sponsorship for this upload.

[Utkarsh Gupta (utkarsh)]

I know Bryce is gonna review this one, so a note for him:

How about we forward this to Debian? I intend to do a new upload soon and can merge this after looking into it. A Salsa MR will be super helpful and quick.

[Bryce Harrington (bryce)]

Hi Lena,

Here is the review comments from this MP. We generally are overly verbose at explaining things for your first few MPs, so don't take the length as indicating anything's bad. Half the suggestions here are stylistic things to consider, but are otherwise treated as personal style choice.

Once you've made the changes, go ahead and squash and force-push back here, and we'll do a second round of review next week.

[Bryce Harrington (bryce)]

review: Needs Fixing

[Bryce Harrington (bryce)]

Overall looks good, a few procedural notes:

When you update your branch make sure to add a comment on the MP itself, responding to feedback such as answering questions or filling in context. If you choose not to take some feedback, or to choose between multiple options, this is a good opportunity to explain rationale.

Make sure to link to your PPA from the MP itself. We use the PPA as proof that the package builds in a controlled environment, and also sometimes do quick tests with it.

https://launchpad.net/~lvoytek/+archive/ubuntu/net-tools-add-dep8

Similarly, when updating your branch with changes, also update the PPA to also carry the changes.

I've verified both tests pass shellcheck

I'll followup with you separately about forwarding these changes to debian

I've built locally and am running the autopkgtests. I've run the tests two different ways - first with a regular container, second with an ephemeral container. As expected, in the former method 'hostname-set-get' gets skipped, but it runs and passes in the second method.

autopkgtest [11:59:02]: @@@@@@@@@@@@@@@@@@@@ summary
hostname-set-get PASS
ifconfig-lo-info PASS

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [!] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [!] verified PPA package installs/uninstalls
  - [!] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

review: Approve

[Bryce Harrington (bryce)]

$ dput ubuntu net-tools_1.60+git20181103.0eebece-1ubuntu4_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: /home/bryce/pkg/NetTools/review-mp410677/net-tools_1.60+git20181103.0eebece-1ubuntu4_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/NetTools/review-mp410677/net-tools_1.60+git20181103.0eebece-1ubuntu4.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading net-tools_1.60+git20181103.0eebece-1ubuntu4.dsc: done.
  Uploading net-tools_1.60+git20181103.0eebece-1ubuntu4.debian.tar.xz: done.
  Uploading net-tools_1.60+git20181103.0eebece-1ubuntu4_source.buildinfo: done.
  Uploading net-tools_1.60+git20181103.0eebece-1ubuntu4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index cb63bc9..bfc9466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+net-tools (1.60+git20181103.0eebece-1ubuntu4) jammy; urgency=low
+
+  * Add new DEP8 tests for hostname and ifconfig (LP: #1679346):
+    - d/t/control: add hostname-set-get and ifconfig-lo-info
+    - d/t/hostname-set-get: new test
+    - d/t/ifconfig-lo-info: new test
+
+ -- Lena Voytek <[e-mail]>  Fri, 22 Oct 2021 07:49:06 -0700
+
 net-tools (1.60+git20181103.0eebece-1ubuntu3) impish; urgency=medium
 
   * No-change rebuild to build packages with zstd compression.
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..be3c442
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,6 @@
+Tests: hostname-set-get
+Depends: net-tools
+Restrictions: needs-root, breaks-testbed
+
+Tests: ifconfig-lo-info
+Depends: net-tools
diff --git a/debian/tests/hostname-set-get b/debian/tests/hostname-set-get
new file mode 100644
index 0000000..5f619af
--- /dev/null
+++ b/debian/tests/hostname-set-get
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+set -e
+
+ORIGINAL_HOSTNAME=$(hostname)
+
+# Test hostname set using: hostname [newname]
+TEST_HOSTNAME="TestHostname"
+hostname "${TEST_HOSTNAME}"
+
+if [ "$(hostname)" != "${TEST_HOSTNAME}" ]; then
+  echo "Failed to set hostname to ${TEST_HOSTNAME} using hostname [newname]"
+  exit 1
+fi
+
+# Test hostname set using: hostname [-F filename | --file filename]
+TEST_HOSTNAME="testF"
+HOSTNAME_FILENAME="hostnamefile"
+
+touch "${HOSTNAME_FILENAME}"
+echo "${TEST_HOSTNAME}" > "${HOSTNAME_FILENAME}"
+hostname -F "${HOSTNAME_FILENAME}"
+rm "${HOSTNAME_FILENAME}"
+
+if [ "$(hostname)" != "${TEST_HOSTNAME}" ]; then
+  echo "Failed to set hostname to ${TEST_HOSTNAME} using hostname -F ${HOSTNAME_FILENAME}"
+  exit 1
+fi
+
+TEST_HOSTNAME="testfile"
+
+touch "${HOSTNAME_FILENAME}"
+echo "${TEST_HOSTNAME}" > "${HOSTNAME_FILENAME}"
+hostname --file "${HOSTNAME_FILENAME}"
+rm "${HOSTNAME_FILENAME}"
+
+if [ "$(hostname)" != "${TEST_HOSTNAME}" ]; then
+  echo "Failed to set hostname to ${TEST_HOSTNAME} using hostname --file ${HOSTNAME_FILENAME}"
+  exit 1
+fi
+
+# Return to original hostname
+hostname "${ORIGINAL_HOSTNAME}"
+
+if [ "$(hostname)" != "${ORIGINAL_HOSTNAME}" ]; then
+  echo "Failed to set hostname back to ${ORIGINAL_HOSTNAME}"
+  exit 1
+fi
diff --git a/debian/tests/ifconfig-lo-info b/debian/tests/ifconfig-lo-info
new file mode 100644
index 0000000..cca6e12
--- /dev/null
+++ b/debian/tests/ifconfig-lo-info
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+# Confirm loopback is in the normal list
+if ! ( ifconfig | grep -q lo: ); then
+  echo "Failed to get lo from ifconfig"
+  exit 1
+fi
+
+# Confirm correctness of loopback device
+LO_OUTPUT=$(ifconfig lo)
+
+if ! ( echo "${LO_OUTPUT}" | grep -q lo: ); then
+  echo "Failed to get lo from ifconfig lo"
+  exit 1
+fi
+
+if ! ( echo "${LO_OUTPUT}" | grep -q "inet 127.0.0.1" ); then
+  echo "Failed to get IP of 127.0.0.1 from ifconfig lo"
+  exit 1
+fi