97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
42 lines
1.5 KiB
Python
42 lines
1.5 KiB
Python
# Copyright 2014 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import os
|
|
import tempfile
|
|
import time
|
|
|
|
from diskimage_builder.tests import base
|
|
|
|
|
|
class TestCacheUrl(base.ScriptTestBase):
|
|
def test_cache_url_caches(self):
|
|
tempdir = tempfile.mkdtemp()
|
|
target = os.path.join(tempdir, 'target')
|
|
source = 'http://fake/url'
|
|
# Write fake data to the target file and return success
|
|
self._stub_script('curl', 'echo "test" > ${3:7:100}\necho 200')
|
|
self._run_command(['elements/cache-url/bin/cache-url',
|
|
source,
|
|
target])
|
|
self.assertTrue(os.path.exists(target))
|
|
modification_time = os.path.getmtime(target)
|
|
# Make sure that the timestamp would change if the file does
|
|
time.sleep(1)
|
|
self._stub_script('curl', 'echo "304"')
|
|
self._run_command(['elements/cache-url/bin/cache-url',
|
|
source,
|
|
target])
|
|
self.assertEqual(modification_time, os.path.getmtime(target))
|