[tests] Correct test package installation

First, correct the logs plugin stagetwo test to specify the needed
package in a list, and second move the import to within the test class
that needs it so that we don't fail on the stageone tests if the package
is not present.

Second, correct the journal injections that this plugin test does to use
`pre_sos_setup()` instead of overriding `setup_mocking()`, and call the
former after the mocking has been setup.

Finally, add the resulting size of the collected journal if we fail the
size requirements of the test.

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/sos_tests.py b/tests/sos_tests.py
index ebef96c4..07308561 100644
--- a/tests/sos_tests.py
+++ b/tests/sos_tests.py
@@ -262,12 +262,12 @@ class BaseSoSReportTest(BaseSoSTest):
             # setup our class-shared tmpdir
             self._setup_tmpdir()
 
-            # do any pre-execution setup
-            self.pre_sos_setup()
-
             # do mocking called for in stage 2+ tests
             self.setup_mocking()
 
+            # do any pre-execution setup
+            self.pre_sos_setup()
+
             # gather some pre-execution information
             self.set_pre_sysinfo()