Merge ~morphis/snappy-hwe-snaps/+git/wifi-ap:improve-debugging into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Simon Fels]

Improve debugging and fix test run with locally build snap

 * Only show bash execution steps when debug mode is eanbled
 * Load mac80211_hwsim driver a bit earlier before the first test runs

[Matteo Croce (teknoraver)]

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:1c6680cd2a8ec75b70b1aa033451a28aaee8dbd5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/512/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/248/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/420/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/512/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:1c6680cd2a8ec75b70b1aa033451a28aaee8dbd5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/513/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/249
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/421/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/513/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:2d059f12aa21de1c12364ce5d50bd5d83a1184c5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/514/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/250
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/422/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/514/rebuild

review: Approve (continuous-integration)

diff --git a/bin/ap.sh b/bin/ap.sh
index 27e3595..a21cfa1 100755
--- a/bin/ap.sh
+++ b/bin/ap.sh
@@ -14,23 +14,28 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
-
 if [ $(id -u) -ne 0 ] ; then
 	echo "ERROR: $0 needs to be executed as root!"
 	exit 1
 fi
 
 . $SNAP/bin/config-internal.sh
-. $SNAP/bin/helper.sh
 
-DEFAULT_ACCESS_POINT_INTERFACE="ap0"
+if [ $DEBUG = "true" ]; then
+	set -x
+fi
+
+# Now after we have enabled debugging or not we can safely load
+# all others necessary bits.
+. $SNAP/bin/helper.sh
 
 if [ $DISABLED = "true" ] ; then
 	echo "Not starting as WiFi AP is disabled"
 	exit 0
 fi
 
+DEFAULT_ACCESS_POINT_INTERFACE="ap0"
+
 # Make sure the configured WiFi interface is really available before
 # doing anything.
 if ! ifconfig $WIFI_INTERFACE ; then
diff --git a/bin/helper.sh b/bin/helper.sh
index f535325..147fe89 100644
--- a/bin/helper.sh
+++ b/bin/helper.sh
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
-
 does_interface_exist() {
 	[ -d /sys/class/net/$1 ]
 }
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index 52d622a..38380e2 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Simulate two WiFi radio network interfaces
+modprobe mac80211_hwsim radios=2
+
 # We don't have to build a snap when we should use one from a
 # channel
 if [ -n "$SNAP_CHANNEL" ] ; then
@@ -12,9 +15,6 @@ if [ -e /home/wifi-ap/wifi-ap_*_amd64.snap ] ; then
 	exit 0
 fi
 
-# Simulate two WiFi radio network interfaces
-modprobe mac80211_hwsim radios=2
-
 # Setup classic snap and build the wifi-ap snap in there
 snap install --devmode --beta classic
 cat <<-EOF > /home/test/build-snap.sh