This patch modifies the test_build_and_deploy method to work even when testing with real hardware where the machine has already been pre-deployed in the model. The attaching of required resources after the bundle deployment is handled here as well.
The test execution logic has also been slightly tweaked. If the --collectors option is provided, then ONLY the real hardware dependent tests will be executed (marked with the "realhw" marker, belonging to TestCharmWithHW). If the option not provided, the hardware independent tests (in TestCharm) will be executed. If full tests are required, a make target can possibly be created which runs the pytest command with and without providing collectors.
Some logic has also been added to ensure that the test_build_and_deploy function will run for both, hardware dependent and independent tests.
This patch modifies the
test_build_and_deploymethod to work even when testing with real hardware where the machine has already been pre-deployed in the model. The attaching of required resources after the bundle deployment is handled here as well.The test execution logic has also been slightly tweaked. If the
--collectorsoption is provided, then ONLY the real hardware dependent tests will be executed (marked with the "realhw" marker, belonging toTestCharmWithHW). If the option not provided, the hardware independent tests (inTestCharm) will be executed. If full tests are required, a make target can possibly be created which runs the pytest command with and without providing collectors.Some logic has also been added to ensure that the
test_build_and_deployfunction will run for both, hardware dependent and independent tests.