Merge lp:~allenap/maas/remove-squashfs into lp:maas/trunk

Proposed by Gavin Panella on 2012-11-12
Status: Merged
Approved by: Andres Rodriguez on 2012-11-13
Approved revision: 1345
Merged at revision: 1347
Proposed branch: lp:~allenap/maas/remove-squashfs
Merge into: lp:maas/trunk
Diff against target: 427 lines (+4/-271)
11 files modified
contrib/maas-http.conf (+0/-6)
contrib/preseeds_v2/generic (+0/-9)
contrib/preseeds_v2/preseed_master (+0/-3)
etc/maas/import_pxe_files (+0/-1)
etc/maas/import_squashfs (+0/-6)
scripts/maas-import-pxe-files (+0/-27)
scripts/maas-import-squashfs (+0/-172)
setup.py (+1/-3)
src/maasserver/preseed.py (+1/-12)
src/maasserver/tests/test_preseed.py (+2/-29)
src/provisioningserver/tests/test_maas_import_pxe_files.py (+0/-3)
To merge this branch: bzr merge lp:~allenap/maas/remove-squashfs
Reviewer Review Type Date Requested Status
Julian Edwards (community) 2012-11-12 Approve on 2012-11-13
Dave Walker (community) Needs Fixing on 2012-11-12
Review via email: mp+133954@code.launchpad.net

Commit message

Remove all install-via-squashfs support.

To post a comment you must log in.
Dave Walker (davewalker) wrote :

This doesn't comment a bug, or rational for removing this support.

review: Needs Fixing
Gavin Panella (allenap) wrote :

> This doesn't comment a bug, or rational for removing this support.

Good point. I've linked to 3 related bugs.

Rationale: this feature is not ready.

It has no automated tests, is attracting a disproportionate number of bugs, and doesn't work by most/all accounts. It should not have been landed in the first place. For an optimisation it's causing too many issues, so we (Julian, Raphael, Martin, myself) agreed this morning to remove it. We can reintroduce it, or its successor, once it's rock-solid outside of MAAS.

Julian Edwards (julian-edwards) wrote :

Dave, as Gavin says this feature is utterly broken right now, has no tests and I personally have never seen it work properly. I would be happy to re-instate it when the above are fixed, but I am under the impression (correct me if wrong) that you guys are working on something else anyway? In addition, I remember being told at UDS that it doesn't really speed up installation much over the d-i method.

I'll approve the change here on condition that Dave is ok with it too, based on my comments.

review: Approve
Gavin Panella (allenap) wrote :

Daviey seems to be okay with this now (#maas, freenode) so I think we can move ahead.

Andres Rodriguez (andreserl) wrote :

So let me get this straight... the reason of the removal is because its causing too many issues (bugs).

What are those?

1. One bug report I see linked is server side and is *not* An ssue with this feature.
2. Another report is an issue of not having updated a file with the release we want to import which is not even related to the script maas-import-squashfs but also affects maas-import-pxe-files and maas-import-ephemerals. and this bug would have still being there even of the feature wouldnt have existed.
3. Legitimate maas-import-squashfs.

So from above.. how in the world this feature is attracting a disproportionate number of bugs if only 1 of them is related.... with a fix that should only take a couple lines of code???

So i think t is not fair to argue that this causes more issues than anything else.

While it does lack tests.. so that's other import script that we have also seen broken in worse ways. This scripts is rock solid outside Maas and not because there's one minor bug it isn't. Otherwise other things wouldn't be rock solid for same or even worse bugs found in released versions of Maas.

Gavin Panella (allenap) wrote :

> So let me get this straight... the reason of the removal is because its
> causing too many issues (bugs).
>
> What are those?
>
> 1. One bug report I see linked is server side and is *not* An ssue with this
> feature.
> 2. Another report is an issue of not having updated a file with the release we
> want to import which is not even related to the script maas-import-squashfs
> but also affects maas-import-pxe-files and maas-import-ephemerals. and this
> bug would have still being there even of the feature wouldnt have existed.
> 3. Legitimate maas-import-squashfs.

Removing squashfs support means we can close two of these bugs, and
the third becomes a trivial fix.

>
> So from above..  how in the world this feature is attracting a
> disproportionate number of bugs if only 1 of them is related.... with a fix
> that should only take a couple lines of code???

For the size and benefit of the feature - i.e. a ~1 minute speedier
install - it's attracting a disproportionately high number of
bugs. That's my impression - I haven't tried to quantify it - but I'm
not alone in thinking this.

> So i think t is not fair to argue that this causes more issues than
> anything else.

I'm not saying that. I'm saying that it's more trouble than it's worth
right now. We don't *need* it, so it's better to move it out so that
we can work on - and SRU - a less-featureful but more stable product.

What is broken is the lack of tests. "Untested code is broken code" is
a principle that the Launchpad teams have all tried to follow for
years. It would be good to reintroduce this feature later on, or FPI,
but not in its current form.

>
> While it does lack tests.. so that's other import script that we have also
> seen broken in worse ways. This scripts is rock solid outside Maas and not
> because there's one minor bug it isn't. Otherwise other things wouldn't be
> rock solid for same or even worse bugs found in released versions of Maas.

Bugs filed is not a measure of quality.

Andres Rodriguez (andreserl) wrote :

> > 1. One bug report I see linked is server side and is *not* An ssue with this
> > feature.
> > 2. Another report is an issue of not having updated a file with the release
> we
> > want to import which is not even related to the script maas-import-squashfs
> > but also affects maas-import-pxe-files and maas-import-ephemerals. and this
> > bug would have still being there even of the feature wouldnt have existed.
> > 3. Legitimate maas-import-squashfs.
>
> Removing squashfs support means we can close two of these bugs, and
> the third becomes a trivial fix.

Closing 1 doesn't change the fact that it is still an issue om the server side. If for some reason the PXE images would be unavailable from the server, then the same bug would apply to maas-import-pxe-files, or to maas-import-ephemerals for such case. That's even if we didn't have the support for squashfs. Either way, the bug reported by Diogo was only seen in the lab that maybe had bad mirrors, because it was proven that at other locations the bug wasn't present.

2 is a bug which is unrelated with squashfs support because this bug affects maas-import-pxe-files and maas-import-ephemerals. Removing the support doesn't fix it, because the bug will still be present even if there was no squashfs support. In fact, there's was a bug in MAAS that affected installations using squashfs, not because of the support but because of a bug in MAAS.

3. Simple fix.

>
> For the size and benefit of the feature - i.e. a ~1 minute speedier
> install - it's attracting a disproportionately high number of
> bugs. That's my impression - I haven't tried to quantify it - but I'm
> not alone in thinking this.

2 minute to be exact.

> What is broken is the lack of tests. "Untested code is broken code" is
> a principle that the Launchpad teams have all tried to follow for
> years. It would be good to reintroduce this feature later on, or FPI,
> but not in its current form.

Right, but I was just pointing out that it isn't the only thing untested that maas ships, is it? However, its been placed as a strong reason for dropping the support.

>
> Bugs filed is not a measure of quality.

Exactly, number of bugs is not a measure of quality; yet, the statement for removal of the feature is based on "disproportionate number of bugs" and "doesn't work by most/all accounts", which are both based and backed by 3 bug reports linked to this MP. However, both statements IMHO are incorrect.

Cheers

Gavin Panella (allenap) wrote :

On 13 November 2012 17:11, Andres Rodriguez <...> wrote:
...
>> For the size and benefit of the feature - i.e. a ~1 minute speedier
>> install - it's attracting a disproportionately high number of
>> bugs. That's my impression - I haven't tried to quantify it - but I'm
>> not alone in thinking this.
>
> 2 minute to be exact.

It's still an optimisation; it's neither needed for correct operation,
nor is it such a huge improvement that we could call it a killer
feature. FPI may qualify as the latter.

>
>
>> What is broken is the lack of tests. "Untested code is broken code" is
>> a principle that the Launchpad teams have all tried to follow for
>> years. It would be good to reintroduce this feature later on, or FPI,
>> but not in its current form.
>
> Right, but I was just pointing out that it isn't the only thing
> untested that maas ships, is it? However, its been placed as a
> strong reason for dropping the support.

Most parts that ship are tested; if something isn't tested it's a bug.

Notably the maas-import-* scripts are almost untested (there are basic
tests in provisioningserver.tests.test_maas_import_pxe_files, though
these just check the "happy path"; they don't demonstrate what happens
when there's an error).

I'd like to either massively increase test coverage for these scripts,
or remove them.

I'm not sure we have the time to improve test coverage, given that
writing tests often involves refactoring to make code testable, and
that we have no baseline to refactor against except for manual QA...
because there are almost no existing tests.

We need maas-import-pxe-files, -ephemerals and -isos, so we can't
remove them. However, we don't *need* squashfs support, so we don't
need maas-import-squashfs. Given that the feature does not work, and
that it needs non-trivial investment to get it working and covered by
tests, there's really no good argument for keeping it in trunk right
now.

Julian Edwards (julian-edwards) wrote :

On 14/11/12 03:55, Gavin Panella wrote:
> We need maas-import-pxe-files, -ephemerals and -isos, so we can't
> remove them. However, we don't *need* squashfs support, so we don't
> need maas-import-squashfs. Given that the feature does not work, and
> that it needs non-trivial investment to get it working and covered by
> tests, there's really no good argument for keeping it in trunk right
> now.

This is the key point for me. squashfs brings little relative
improvement for the amount of untested code that we're carrying to make
it happen. The risk of failure versus the return is quite bad.

We'll be very happy to work with the server team to make FPI well
engineered and tested.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/maas-http.conf'
2--- contrib/maas-http.conf 2012-10-10 09:30:11 +0000
3+++ contrib/maas-http.conf 2012-11-12 16:27:31 +0000
4@@ -51,12 +51,6 @@
5 SetHandler None
6 </Directory>
7
8-# Serve squashfs images
9-Alias /MAAS/static/images/ /var/lib/maas/tftp/
10-<Directory /var/lib/maas/tftp/>
11- SetHandler None
12-</Directory>
13-
14 # Serve files from staticfiles.
15 Alias /MAAS/static/ /usr/share/maas/web/static/
16 <Directory /usr/share/maas/web/static/>
17
18=== modified file 'contrib/preseeds_v2/generic'
19--- contrib/preseeds_v2/generic 2012-11-08 11:23:19 +0000
20+++ contrib/preseeds_v2/generic 2012-11-12 16:27:31 +0000
21@@ -1,14 +1,5 @@
22 {{inherit "preseed_master"}}
23
24-{{def squashfs_image}}
25-{{if node.distro_series in {'quantal'} and node.architecture in {'i386/generic', 'amd64/generic'} and use_squashfs is True }}
26-d-i preseed/early_command string anna-install live-installer
27-d-i live-installer/enable boolean true
28-d-i live-installer/mode select normal
29-d-i live-installer/net-image string http://{{server_host}}/MAAS/static/images/{{node.architecture}}/{{node.distro_series}}/filesystem/filesystem.squashfs
30-{{endif}}
31-{{enddef}}
32-
33 {{def proxy}}
34 d-i mirror/country string manual
35 {{if node.architecture in {'i386/generic', 'amd64/generic'} }}
36
37=== modified file 'contrib/preseeds_v2/preseed_master'
38--- contrib/preseeds_v2/preseed_master 2012-10-02 19:08:05 +0000
39+++ contrib/preseeds_v2/preseed_master 2012-11-12 16:27:31 +0000
40@@ -3,9 +3,6 @@
41 # * Cloud-init for bare-metal
42 # * Cloud-init preseed data
43
44-# Squashfs Installation
45-{{self.squashfs_image}}
46-
47 # Locale
48 d-i debian-installer/locale string en_US.UTF-8
49
50
51=== modified file 'etc/maas/import_pxe_files'
52--- etc/maas/import_pxe_files 2012-10-25 13:25:46 +0000
53+++ etc/maas/import_pxe_files 2012-11-12 16:27:31 +0000
54@@ -17,4 +17,3 @@
55 #ARCHES="amd64/generic i386/generic armhf/highbank"
56 #LOCALE="en_US"
57 #IMPORT_EPHEMERALS=1
58-#IMPORT_SQUASHFS=1
59
60=== removed file 'etc/maas/import_squashfs'
61--- etc/maas/import_squashfs 2012-09-29 03:12:23 +0000
62+++ etc/maas/import_squashfs 1970-01-01 00:00:00 +0000
63@@ -1,6 +0,0 @@
64-## get default settings from import_pxe_files
65-[ ! -f /etc/maas/import_pxe_files ] || . /etc/maas/import_pxe_files
66-
67-#SQUASHFS_ARCHIVE="https://cdimage.ubuntu.com"
68-#RELEASES="quantal"
69-#ARCHES="amd64 i386"
70
71=== modified file 'scripts/maas-import-pxe-files'
72--- scripts/maas-import-pxe-files 2012-11-08 14:37:46 +0000
73+++ scripts/maas-import-pxe-files 2012-11-12 16:27:31 +0000
74@@ -42,14 +42,6 @@
75 # directory. A wget command line will work here, but curl will do as well.
76 DOWNLOAD=${DOWNLOAD:-wget --no-verbose}
77
78-# Whether to download squashfs images as well: "1" for yes, "0" for no.
79-# Default is yes.
80-IMPORT_SQUASHFS=${IMPORT_SQUASHFS:-1}
81-
82-# Whether to download squashfs images as well: "1" for yes, "0" for no.
83-# Default is yes.
84-IMPORT_SQUASHFS=${IMPORT_SQUASHFS:-1}
85-
86 # Whether to download ephemeral images as well: "1" for yes, "0" for no.
87 # Default is yes.
88 IMPORT_EPHEMERALS=${IMPORT_EPHEMERALS:-1}
89@@ -198,24 +190,6 @@
90 }
91
92
93-# Download and install the squashfs root images.
94-import_squashfs_images() {
95- if test "$IMPORT_SQUASHFS" != "0"
96- then
97- maas-import-squashfs
98- fi
99-}
100-
101-
102-# Download and install the squashfs root images.
103-import_squashfs_images() {
104- if test "$IMPORT_SQUASHFS" != "0"
105- then
106- maas-import-squashfs
107- fi
108-}
109-
110-
111 # Download and install the ephemeral images.
112 import_ephemeral_images() {
113 if test "$IMPORT_EPHEMERALS" != "0"
114@@ -232,7 +206,6 @@
115
116 update_pre_boot_loader
117 import_install_images
118- import_squashfs_images
119 import_ephemeral_images
120 }
121
122
123=== removed file 'scripts/maas-import-squashfs'
124--- scripts/maas-import-squashfs 2012-10-02 19:08:05 +0000
125+++ scripts/maas-import-squashfs 1970-01-01 00:00:00 +0000
126@@ -1,172 +0,0 @@
127-#!/bin/bash
128-#
129-# maas-import-squashfs - sync and import squashfs images
130-#
131-# Copyright (C) 2012 Canonical
132-#
133-# Authors:
134-# Andres Rodriguez <andres.rodriguez@canonical.com>
135-#
136-# This program is free software: you can redistribute it and/or modify
137-# it under the terms of the GNU Affero General Public License as
138-# published by the Free Software Foundation, version 3 of the License.
139-#
140-# This program is distributed in the hope that it will be useful,
141-# but WITHOUT ANY WARRANTY; without even the implied warranty of
142-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
143-# GNU Affero General Public License for more details.
144-#
145-# You should have received a copy of the GNU Affero General Public License
146-# along with this program. If not, see <http://www.gnu.org/licenses/>.
147-
148-# Exit immediately if a command exits with a non-zero status.
149-set -o errexit
150-# Treat unset variables as an error when substituting.
151-set -o nounset
152-
153-# Load settings if available.
154-settings="/etc/maas/import_squashfs"
155-[ -r $settings ] && . $settings
156-local_settings="$(pwd)/$settings"
157-[ -r $local_settings ] && . $local_settings
158-
159-# Download locations for Ubuntu releases.
160-#http://cdimage.ubuntu.com/ubuntu-server/daily/current/
161-SQUASHFS_ARCHIVE=${ARCHIVE:-http://cdimage.ubuntu.com/}
162-
163-# Ubuntu releases that are to be downloaded.
164-SUPPORTED_RELEASES=""
165-for supported in $(distro-info --supported)
166-do
167- if [ $(expr "$supported" \>= "quantal") -eq 1 ]; then
168- SUPPORTED_RELEASES="${SUPPORTED_RELEASES:-}${supported} "
169- fi
170-done
171-
172-EFFECTIVE_RELEASES=""
173-if [ -z "$RELEASES" ]; then
174- RELEASES=${RELEASES:-$SUPPORTED_RELEASES}
175-else
176- for release in $RELEASES
177- do
178- [[ "$SUPPORTED_RELEASES" =~ "${release}" ]] && EFFECTIVE_RELEASES="${EFFECTIVE_RELEASES:-}${release} "
179- done
180- RELEASES="$EFFECTIVE_RELEASES"
181-fi
182-
183-# The current Ubuntu release.
184-STABLE_RELEASE=$(distro-info --stable)
185-
186-# Supported architectures.
187-ARCHES=${ARCHES:-amd64/generic i386/generic}
188-
189-# Command line to download a resource at a given URL into the current
190-# directory. A wget command line will work here, but curl will do as well.
191-DOWNLOAD=${DOWNLOAD:-wget --no-verbose}
192-
193-# Whether to download squashfs images as well: "1" for yes, "0" for no.
194-# Default is yes.
195-IMPORT_SQUASHFS=${IMPORT_SQUASHFS:-1}
196-
197-# Put together a full URL for where the installer files for architecture $1
198-# and release $2 can be downloaded.
199-compose_installer_download_url() {
200- local arch=$1 release=$2
201-
202- case $arch in
203- amd64/*|i386/*)
204- local installer_url="$SQUASHFS_ARCHIVE/ubuntu-server/daily/current"
205- echo $installer_url
206- ;;
207- *)
208- echo "Unknown architecture: $arch" >&2
209- exit 1
210- ;;
211- esac
212-}
213-
214-# Return a list of files for architecture $1 and release $2 that need to be
215-# downloaded
216-compose_installer_download_files() {
217- local arch=$1 release=$2
218-
219- case $arch in
220- amd64/*|i386/*)
221- echo "$release-server-${arch%%/*}.squashfs"
222- ;;
223- *)
224- echo "Unknown architecture: $arch" >&2
225- exit 1
226- ;;
227- esac
228-}
229-
230-# Rename downloaded files for architecture $1 and release $2 into the form that
231-# MAAS expects them
232-rename_installer_download_files() {
233- local arch=$1 release=$2
234-
235- case $arch in
236- amd64/*|i386/*)
237- mv $release-server-${arch%%/*}.squashfs filesystem.squashfs
238- ;;
239- *)
240- echo "Unknown architecture: $arch" >&2
241- exit 1
242- ;;
243- esac
244-}
245-
246-# Download kernel/initrd for installing Ubuntu release $2 for
247-# architecture $1 and install it into the TFTP directory hierarchy.
248-update_install_files() {
249- local arch=$1 release=$2
250- local files=$(compose_installer_download_files $arch $release)
251- local url=$(compose_installer_download_url $arch $release)
252- local file
253-
254- mkdir "install"
255- pushd "install" >/dev/null
256- for file in $files
257- do
258- $DOWNLOAD $url/$file
259- done
260- rename_installer_download_files $arch $release
261- popd >/dev/null
262-
263- maas-provision install-pxe-image \
264- --arch="${arch%%/*}" --subarch="${arch#*/}" \
265- --release=$release --purpose="filesystem" \
266- --image="install"
267-}
268-
269-
270-# Download and install the "install" images.
271-import_install_images() {
272- local arch release DOWNLOAD_DIR
273-
274- DOWNLOAD_DIR=$(mktemp -d)
275- echo "Downloading to temporary location $DOWNLOAD_DIR."
276- pushd -- $DOWNLOAD_DIR
277-
278- for arch in $ARCHES
279- do
280- for release in $RELEASES
281- do
282- update_install_files $arch $release
283- done
284- done
285-
286- popd
287- rm -rf -- $DOWNLOAD_DIR
288-}
289-
290-
291-main() {
292- # All files we create here are public. The TFTP user will need to be
293- # able to read them.
294- umask a+r
295- import_install_images
296-}
297-
298-main
299
300=== modified file 'setup.py'
301--- setup.py 2012-11-08 06:34:48 +0000
302+++ setup.py 2012-11-12 16:27:31 +0000
303@@ -58,7 +58,6 @@
304 'etc/maas_cluster.conf',
305 'etc/txlongpoll.yaml',
306 'contrib/maas_local_celeryconfig.py',
307- 'etc/maas/import_squashfs',
308 'contrib/maas_local_celeryconfig_cluster.py',
309 'etc/maas/import_ephemerals',
310 'etc/maas/import_pxe_files',
311@@ -77,8 +76,7 @@
312 'contrib/preseeds_v2/enlist_userdata',
313 'contrib/preseeds_v2/preseed_master']),
314 ('/usr/sbin',
315- ['scripts/maas-import-squashfs',
316- 'scripts/maas-import-ephemerals',
317+ ['scripts/maas-import-ephemerals',
318 'scripts/maas-import-pxe-files']),
319 ],
320
321
322=== modified file 'src/maasserver/preseed.py'
323--- src/maasserver/preseed.py 2012-11-09 09:12:01 +0000
324+++ src/maasserver/preseed.py 2012-11-12 16:27:31 +0000
325@@ -29,10 +29,7 @@
326 NODE_STATUS,
327 PRESEED_TYPE,
328 )
329-from maasserver.models import (
330- BootImage,
331- Config,
332- )
333+from maasserver.models import Config
334 from maasserver.server_address import get_maas_facing_server_host
335 from maasserver.utils import absolute_reverse
336 import tempita
337@@ -246,20 +243,12 @@
338 'preseed_data': compose_preseed(node),
339 'node_disable_pxe_url': node_disable_pxe_url,
340 'node_disable_pxe_data': node_disable_pxe_data,
341- 'use_squashfs': is_squashfs_image_present(node),
342 }
343 context.update(node_context)
344
345 return context
346
347
348-def is_squashfs_image_present(node):
349- """Whether or not the SquashFS image can be used during installation."""
350- arch, subarch = node.architecture.split("/")
351- return BootImage.objects.have_image(
352- node.nodegroup, arch, subarch, node.get_distro_series(), "filesystem")
353-
354-
355 def render_preseed(node, prefix, release=''):
356 """Find and load a `PreseedTemplate` for the given node.
357
358
359=== modified file 'src/maasserver/tests/test_preseed.py'
360--- src/maasserver/tests/test_preseed.py 2012-11-09 09:45:28 +0000
361+++ src/maasserver/tests/test_preseed.py 2012-11-12 16:27:31 +0000
362@@ -37,7 +37,6 @@
363 get_preseed_context,
364 get_preseed_filenames,
365 get_preseed_template,
366- is_squashfs_image_present,
367 load_preseed_template,
368 PreseedTemplate,
369 render_preseed,
370@@ -328,9 +327,8 @@
371 ['node', 'release', 'metadata_enlist_url',
372 'server_host', 'server_url', 'preseed_data',
373 'node_disable_pxe_url', 'node_disable_pxe_data',
374- 'use_squashfs', 'main_archive_hostname',
375- 'main_archive_directory', 'ports_archive_hostname',
376- 'ports_archive_directory'],
377+ 'main_archive_hostname', 'main_archive_directory',
378+ 'ports_archive_hostname', 'ports_archive_directory'],
379 context)
380
381 def test_get_preseed_context_if_node_None(self):
382@@ -371,31 +369,6 @@
383 ))
384
385
386-class TestSquashFSAvailable(TestCase):
387- """Tests for `is_squashfs_image_present`."""
388-
389- # Scenario defaults.
390- arch = "i386"
391- subarch = "generic"
392- series = "quantal"
393- purpose = "filesystem"
394-
395- scenarios = (
396- ("mismatch-arch", dict(arch="amd64", present=False)),
397- ("mismatch-subarch", dict(subarch="special", present=False)),
398- ("mismatch-series", dict(series="precise", present=False)),
399- ("mismatch-purpose", dict(purpose="moonraking", present=False)),
400- ("match", dict(present=True)),
401- )
402-
403- def test_squashfs_available(self):
404- node = factory.make_node(
405- architecture="i386/generic", distro_series="quantal")
406- BootImage.objects.register_image(
407- node.nodegroup, self.arch, self.subarch, self.series, self.purpose)
408- self.assertEqual(self.present, is_squashfs_image_present(node))
409-
410-
411 class TestPreseedTemplate(TestCase):
412 """Tests for class:`PreseedTemplate`."""
413
414
415=== modified file 'src/provisioningserver/tests/test_maas_import_pxe_files.py'
416--- src/provisioningserver/tests/test_maas_import_pxe_files.py 2012-11-08 06:34:48 +0000
417+++ src/provisioningserver/tests/test_maas_import_pxe_files.py 2012-11-12 16:27:31 +0000
418@@ -161,9 +161,6 @@
419 # Suppress running of maas-import-ephemerals. It gets too
420 # intimate with the system to test here.
421 'IMPORT_EPHEMERALS': '0',
422- # Suppress running of maas-import-squashfs. It gets too
423- # intimate with the system to test here.
424- 'IMPORT_SQUASHFS': '0',
425 }
426 env.update(self.config_fixture.environ)
427 if arch is not None: