65 Commits
Author SHA1 Message Date
Castulo Martinez 4c2b636f07 Correct test group code for checkupdate
The check-update tests should use a group code of CHK, but the
test library was using AUT incorrectly which belongs to the autoupdate
tests.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-11-15 10:51:19 -08:00
John Akre 6186a177c8 test: clean up tests when interrupted
Tests will be cleaned up by a trap routine when interrupted early. This
change also moves test web server and certificate store clean up to the
destroy_test_environment function.

Signed-off-by: John Akre <john.w.akre@intel.com>
2018-11-12 14:30:45 -08:00
John Akre 1640fadc8a test: Move test files out of /tmp
Some tests wrote files and directories to /tmp. This change moves the
test certificates directory into the swupd repo's top level directory
and moves other test files into their corresponding test directories.

Fixes #650

Signed-off-by: John Akre <john.w.akre@intel.com>
2018-11-12 14:30:45 -08:00
Castulo Martinez 1438148bbd Adding functions to get test IDs in testlib
Every test should include a unique ID, so it is necessary to have
a way of knowing what is the next available ID for the group of
tests.

This commit helps with that issue by implementing the following
features in the test library:
 - Adds the function get_test_list which can be used to print a
list of tests in a specific group directory.
 - Adds the function get_next_available_id which return the next
test ID that can be used in a new test.
 - When using the generate_test function to generate an empty test
the next available ID will be used for the template.

This commit also adds the ID to a bundle-add test that was missing it.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-11-02 15:25:09 -07:00
Castulo Martinez 4633cba133 Improvements for DEBUG_TEST in test library
When running tests, there is the possibility of preserving your
test environment for debugging purposes.

We were preserving the environment by skipping the execution of
the destroy_test_environment function when the DEBUG_TEST env
variable was set. This had one limitation, this was being done in
the default teardown function, so if the user would define his own
teardown then the DEBUG_TEST had no effect, the same if the user
used global_teardown instead. Another limitation the current
implementation had was that when an environment had been preserved
if the user would forget to clean it up manually before re-running
the test it would cause unexpected results in the test.

This commit removes both limitations by looking for the DEBUG_TEST
variable directly within the destroy_test_environment function so
the env will be preserved regardless of where the function is called
from and removes the environment at the beginning of the test if it
exists.

Closes #651

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-10-30 15:00:22 -07:00
Castulo Martinez f6cab5d0a5 Use verify --fix --picky with older versions
When you do a "verify --fix --picky -m older_version", and one
or more of the currently installed bundles didn't exist back then,
a non useful error message was being used, and the verify operation
would fail.

This commit makes the following changes.

1) With this commit, if the mentioned situation happens, the verify
operation will still be stopped, but a useful message will now be
displayed to inform the user of the situation, and he/she will be
presented with an alternative to proceed using the --force option.

2) If the user uses the --force option, the user will still be warned
but the verify operation will continue and the offending bundles will
be removed from the system.

Closes #608

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-10-30 09:49:42 -07:00
John Akre 897f5d44c8 test: consolidate test web server implementations
There were two web server implementations in the functional tests and the
test library's slow server implementation was not functional. These issues
were addressed by the following changes:

- Consolidate test web server implementations into test library
- Add partial download support to start_web_server test library function
- Fix test library slow server functionality.

Signed-off-by: John Akre <john.w.akre@intel.com>
2018-10-24 09:56:02 -07:00
Castulo Martinez 6b7f2a9ac0 Adding the author and testID info to test template
This commit adds a few improvements to the test template that aim to
make easier to track tests.

As we are trying to organize the swupd tests better, it is useful to
have an easy way to identify who the original author of the test was
in case there are questions regarding the purpose of the test.

It is also useful sometimes to add a long description to a complex
test, so people reading the test understand what the test is attempting
to verify, and why is useful or different.

Lastly, it is a good practice to add a unique ID to every test case,
this makes it easier to track it, and to refer to it.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-10-22 16:22:49 -07:00
Patrick McCarty 69bdacb677 test: add localhost for no_proxy if not present
I see the checkupdate/chk-update-slow-server test fail when the
http_proxy env variable is set, but no_proxy is not set.

Resolve the issue by adding "localhost" to no_proxy if needed, since the
test web servers run on localhost.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-10-22 14:07:15 -07:00
Castulo Martinez 0f16013855 Fix a bug in some verify tests
Some time ago the "-u" option of the create_test_environment and
create_version functions was renamed to "-r". Four of the verify
tests were not updated, so they were crashing during the setup,
while trying to create the test environment, so the test would not
be run since the setup failed but the teardown would still run and
the teardown would attempt to delete a non existent test environment
which would cause the destroy_test_environment to exit the script
causing an inconclusive test result.

This commit fixes the issue by doing the following actions:
- Fixes the tests by using the correct option "-r".
- Modifies the destroy_test_environment function so it does not exit
if a test environment doesn't exist, but instead it just returns a non
zero code and warns the user so the teardown works as expected.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-10-22 13:06:42 -07:00
Castulo Martinez e315a8c75f Detecting download failures during updates
When performing an update, if one or more files fail to be downloaded
the update process continues and the user is not notified of any
failure in the update.

This commit forces the update to abort if one or more files could not
be downloaded and informs the user about the failed update.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-10-22 13:02:43 -07:00
Castulo Martinez 42b8faed0b Adding return code to load_mom
The function load_mom was returning the requested MoM if found or
NULL if not found.

This commit removes the load_mom_err function and adds the capability
of returning the error code to the load_mom function.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-10-22 13:02:43 -07:00
Otavio Pontes 3287a87e53 Remove 404 from the list of possible swupd return codes
Linux programs return code should be a number between 0 and 255, so 404 is an
invalid return code. Removing it from docs and from swupd-error.h file.

As it wasn't being used, this won't be a problem.

Signed-off-by: Otavio Pontes <otavio.pontes@intel.com>
2018-10-18 10:19:29 -07:00
Castulo Martinez ad8129b481 Adding a menu of functions for testlib
This commit adds a menu of the functions that are available for
users when writing tests or just using the library to create
resources to test their code.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-10-17 10:57:29 -07:00
John Akre c9ee84c70c Add minversion support to testlib
Soon, a minversion header field will be included in the MoM. This change
updates the test library to add a minversion header field to MoMs and adds
functions to create a minversion update. Also, the skip-verified-fullfiles
test was replaced by the update-minversion test. The update-minversion test
verifies that unchanged files with a version bump caused by a minversion
update are skipped during an update.

Signed-off-by: John Akre <john.w.akre@intel.com>
2018-09-27 15:03:43 -07:00
Castulo Martinez 5091d0daa2 Enable peeking at the state directory with testlib
The test library contains a few assertions meant to verify the
existence or non existence of files and directories. In the case
of swupd, it is sometimes common that these files can be in directories
that are not readable by non root users, which is the case of the state
directory.

This commit makes a change so these assertions use root for testing
the existence of these files and directories so we don't get false
positives in the tests.
The commit also adds one more env variable with the --keepcache
option so we can use it in tests that require the state directory
to be persisted.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-09-27 12:48:14 -07:00
Castulo Martinez d76b34889d Removing old test library swupd.bash
The old test library swupd.bash was replaced by testlib.bash.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-09-27 12:48:14 -07:00
Castulo Martinez 8d9054d9fc Print function for testlib
When a user wants to print to the terminal from a test that
is using the bats framework, it is necessary to use file descriptor
3.

This commit provides a wrapper function called print so it is
easier for user to print to terminal from tests.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
2018-09-27 12:48:14 -07:00
Otavio Pontes d4f3251e66 testlib: Add guards to sed to avoid incorrect replaces
When updating the manifest version we were replacing any line with the word
version to "version: new_version". This is a problem now that we are adding
a minversion field to the manifest. That could be a problem too when there
was a file named version.

Signed-off-by: Otavio Pontes <otavio.pontes@intel.com>
2018-09-27 11:48:35 -07:00
Castulo Martinez ed736667f9 Add iterative manifest to bundle update in testlib
This commit adds the iterative manifests (to-manifest) and the delta
manifest (from-manifest) when creating a bundle update. This manifests
should contain only those files that changed in the latest version.

Closes issue #557
2018-09-11 15:08:21 -07:00
Castulo Martinez 3ef7b3c507 Anchoring regex patterns when needed
There are some cases in the library where sed or awk is used to find
certain lines within files. To match these lines we use a pattern.
In some cases this pattern should be anchored to the beginning of the
line, in case a string with that pattern appears in a file (for example
in a bundle manifest name) in the last field. This is unlikely, but
it's better to avoid unintentional matches.
2018-09-06 15:00:10 -07:00
Castulo Martinez 67a926fbce Info about bump_format and update_bundle to docs
Adding documentation about the bump_format and update_bundle
functions to the readme.
2018-09-06 15:00:10 -07:00
Castulo Martinez e50d993084 Option to make update to os-core with new versions
When a user creates a new version in a test environment and uses
the -r option an updated version of the os-release and format files
are added to the files directory. This is useful for some tests
like update tests.

This commit adds a second step of adding the updated files to the
os-core bundle so it is easier to create updates. With this commit
if using the option -r it means the new version will include an
update to the os-core bundle.
2018-09-06 15:00:10 -07:00
Castulo Martinez 4caa28369d Adding function to bump formats between versions
This commit adds a new function to bump formats between two
subsequent versions in the server side content.
2018-09-06 15:00:10 -07:00
Castulo Martinez 27095ed662 Add function to update bundles between versions
This commit adds a new function to the test library which is
useful for creating bundle updates between versions in the server
side.
2018-09-06 15:00:10 -07:00
John Akre 6bc19e0e77 Use an SSL client certificate if provided
To support clients that need to authenticate with a web server
containing protected swupd content, an SSL certificate should be
presented if defined. This commit enables client certificate
authentication with swupd and adds relevant tests.

credit: gtkramer implemented client certificates in swupd

Signed-off-by: John Akre <john.w.akre@intel.com>
2018-09-05 16:15:03 -07:00
John Akre 6eb95d4198 Add web server test objects to testlib
This commit adds the following test objects to testlib:

- start_web_server
- destroy_web_server

This change moves the implementation of web server creation and
destruction from individual tests to the test library.

Signed-off-by: John Akre <john.w.akre@intel.com>
2018-09-05 16:15:03 -07:00
John Akre 48aaa28f29 Add certificate support to testlib
This commit adds functions to testlib for the following:

- generate_certificate
- create_trusted_cacert
- destroy_trusted_cacert

These functions are used to create a self-signed public/private key
pair, create a trusted key store for the test environment with a public
key, and to delete the trusted key store. For the test environment to use
the trusted key store, swupd must be configured using
--with-fallback-capaths=<path to key store>. This configuration option
has been added to autogen and travis.

Signed-off-by: John Akre <john.w.akre@intel.com>
2018-09-05 16:15:03 -07:00
Castulo Martinez 54f3e37236 Fixing error deleting files when removing a bundle
When "uninstalling" a bundle in web-dir it is better not to
remove all files in the bundle's manifest because they may be used
by another bundle, and checking every manifest would be too expensive
for this test task. Removing the bundle manifest and its packs is
enough for testing purposes.
2018-08-23 09:45:53 -07:00
Castulo Martinez dffe6b53e1 Adding partial update option for manifest changes
Some functions from the test library can be used by end users to
modify some object from their test environment, for example using
the add_dependency_to_manifest they can add one or many dependencies
to a bundle's manifest. After modifying a bundle's manifest, many
subsequent actions need to occur in order for the objects to still be
valid, the manifest's tar needs to be re-created, since the manifest's
hash changed, the MoM needs to be updated with this new hash, etc.
To minimize the actions an end user needs to do, most of these
activities are automatically performed by most library functions.
However if the function is being called by another function which
expects to perform many actions in the same object, it may not be the
best option to be re-creating those tars and updating the MoM many times
for the same object since it could affect the performance.

This commit adds a -p flag to some functions to tell the functions you only
want a partial update, meaning that you plan on making more changes to the
test object so all those unnecessary changes are not performed.
2018-08-23 09:45:53 -07:00
Castulo Martinez 59ed44faf8 Ability to create environment with complex bundle
Normal test environments come with a minimal version of os-core
bundle by default (only one file and the tracking file). Users
also have the option of not having os-core at all with the -e
"empty" option.

This commit adds another option "-r" for creating a test environment
that includes a more complete version of the os-core bundle,
with a couple of useful files: os-release and format. This type
of bundle can be useful when working with some type of tests like
updates.
2018-08-22 09:49:43 -07:00
Castulo Martinez 489a11adfc Add function to create new test versions
Some tests need to have not only one but two or more versions of
the server side content (web-dir).

This commit adds a function that can be used to create these new
versions.
2018-08-21 14:13:13 -07:00
Castulo Martinez 758f2483f3 New function to modify manifests in tests
It is very common to manipulate manifests when writing tests for
swupd, so in order to make it easier for users, and less error
prone, this commit introduces a function to manipulate data from
a manifest easily.
2018-08-21 13:21:02 -07:00
Castulo Martinez 99345d2089 New function to add files to a pack
Having to manually add files to the pack's tar everytime we are
dealing with delta or zero packs is error prone since those packs
should have files in a specific path for them to be used correctly
by swupd client.

This commit introduces a function to add files to zero or delta
packs in a consistent way.
2018-08-21 13:21:02 -07:00
Castulo Martinez a832dd6fd9 Fix bug removing a directory still in use
When removing a dummy bundle using the test library, the library
tries to remove bundle files and directories from the file system,
however if the directory that is being removed is not empty, it
will cause the function to exit with a non zero code.

This commit fixes the bug by adding an option for ignoring this
scenario.
2018-08-20 15:11:19 -07:00
Castulo Martinez a087f89d58 Add ability to use existing files creating bundles
When creating a bundle using the testlib functions, if the user
wants the bundle to include files, those files are generated
automatically with random content.

This commit adds the capability of specifying an existing file to
be used for the bundle by using the
"-f <file in manifest>:<file to use>" notation.
2018-08-20 15:11:19 -07:00
Castulo Martinez 60e7d43dc2 Removing unnecessary directory from test bundle
When creating a test bundle, if the user didn't select any directory,
file, or link to be added to the bundle, the bundle would add
directory /usr/bin by default so the bundle would not be totally
empty, however since the bundle also always adds the tracking file
(/usr/share/clear/bundles/"$bundle_name") to the bundle, then it is
not necessary, and actually undesired to add /usr/bin by default.

This commit removes the addition of /usr/bin by default.
2018-08-20 15:11:19 -07:00
Castulo Martinez 79cb7532a3 Adding ability to create empty test environments
Test environments have all the basic elements to test swupd-client
and one of those elements is the dummy os-core bundle created and
installed in the target-dir by default. Sometimes, the person
writing a test may need to have a completely empty test environment,
meaning with no os-core bundle.

This commit adds the capability of creating a test environment with
no os-core bundle by default, by using the -e (empty) option. The
commit also modifies the os-core bundle that is being generated by
default from having one file in /ur/bin/core to being just /core,
this way the os-core bundle is smaller and faster to be created,
which is important since it is always added by default to every
test.
2018-08-20 15:11:19 -07:00
Castulo Martinez 82fc78075b Fixing a bug creating bundles with nested dirs
When creating bundles, users get to choose if they want to include
files, directories, links or dangling links in the bundle. Whatever
choice they make, all the directories that are part of the path of
the element should be created. This wasn't happening when creating
bundles with nested directories, for example /foo/bar/baz, in this
case only dir /foo/bar/baz was being added to the manifest of the
bundle but neither /foo nor /foo/bar were being added.

This commit fixes that issue. It also adds a safety feature where
it adds a '/' in front of dirs or file when user creates a bundle
in case they forget to add it themselves so the function works
properly even in that situation. For example with something like
this "-f /foo,bar/baz"
2018-08-20 15:11:19 -07:00
Castulo Martinez 2dc02e3f81 Adding usage info for set_latest_version 2018-08-20 15:11:19 -07:00
Castulo Martinez fe89f2f9c8 Updating the template for the test generator
Users can generate new tests with some default values based on a
template.

This commit updates that template so the generated file is more
useful.
2018-08-20 15:11:19 -07:00
Castulo Martinez ee9b3c348c Fixes a bug when retrieving hashes from manifests
There is an issue with the get_hash_from_manifest function where
in some cases if there are two files that share the same path,
both would be picked up.

This commit fixes the issue by being more slective when choosing
the line.
2018-08-20 15:11:19 -07:00
Castulo Martinez fadabdda9d Fix a bug when updating hashes in MoM
This commit fixes a bug when updating the hashes of manifests in
MoM. When doing this, all bundles were being removed and re-added
to the MoM using the remove_from_manifest and add_to_manifest
functions, but this was having some undesired side effects.

This commit implements the update of hashes in MoM in a different
way.
2018-08-20 15:11:19 -07:00
Castulo Martinez d9892c0336 Decrease count/size when removing from manifest
When removing a file or directory from a manifest the filecount and
contentsize in the manifest were not being decreased. Also after
removing an item from the manifest, the hash of the manifest will
change, which means the person using this function in a test needs
to remember to update the hash of the manifest in the MoM or the
test will fail because the MoM will be discarded as corrupt.

This commit decreases the values of both fields so the manifest is
still accurate after removing elements from it.
Also after removing an element from the manifest, the MoM will have
its hashes automatically updated so to release the end user from
remembering doing this.

Finally this commit include an update for a test that use the
remove_from_manifest function since it doesn't need to update hashes
in the MoM as a separate step any more.
2018-08-20 15:11:19 -07:00
Castulo Martinez dfe878d159 Allow adding bundle dependency in newer versions
With the current test library a user can create a test bundle and
then add a dependency to that bundle by adding it to the bundle's
manifest. However this only worked if there was only one version
available in the web-server.
A second issue was that after modifying the manifest the hash
in the MoM would need to be updated.

This commit allow users to create a version N, create a bundle
for version N, then create a version N+M and add a dependency to
that bundle in that new version N+M.
It also recalculate all hashes in the MoM so users writing tests
don't need to remember to update them themselves.

Finally this commit includes some updates for some tests that use
the add_dependency_to_manifest function since they don't need to
update hashes in the MoM as a separate step any more.
2018-08-20 15:11:19 -07:00
Castulo Martinez fe196094ec Changes how contentsize is read from a manifest
This commit changes the way the contentsize was being read from the
manifest, making it a little more efficient and easier to read by
replacing a piped call of cat + grep + awk, to only using awk.
It also includes a couple of changes in the comments of the
function so they are more accurate.
2018-08-20 15:11:19 -07:00
Castulo Martinez 722befea90 Export more useful variables in a test environment
The set_env_variables function exports different variables that
are dependent of a specific test environment. This commit adds a
few more variables that can be used to reduce the typing when writing
tests.
2018-08-20 15:11:19 -07:00
Castulo Martinez c17c3f00ce Fixes typo in write_to_protected_file function
Fixing typo: appeneded -> appended
2018-08-15 17:24:28 -07:00
Castulo Martinez 8bab78fbe4 Allow leaving a test environment for debugging
Automated tests should create its own test environment including
all needed dependencies when the test starts, and should clean up
after itself once the test is over. Sometimes when developing
these tests, they don't work as expected at first and is difficult
to figure out what the problem is if the test environment is gone.

This commit allow users to temporarily skip the removal of the test
environment so he/she can debug what the problem was by only running
the test with the DEBUG_TEST env variable set to "true".

Example: DEBUG_TEST=true bats my_test.bats
2018-08-15 17:24:28 -07:00
Castulo Martinez db746d6dd2 Adds two more assertions to testlib
This commit adds the following two assertions:
- assert_files_equal
- assert_files_not_equal

These can be used in tests for validating file equality consistently.
2018-08-15 17:24:28 -07:00