upgrade bbtests

bbtest/helpers/logger.py

@@ -7,6 +7,6 @@
 
 def logger():
   log = logging.getLogger('bbtest')
-  log.addHandler(journal.JournaldLogHandler())
+  log.addHandler(journal.JournalHandler())
   log.setLevel(logging.DEBUG)
   return log 

bbtest/helpers/unit.py

@@ -161,7 +161,7 @@ def teardown(self):
     self.collect_logs()
 
   def __get_systemd_units(self):
-    (code, result, error) = execute(['systemctl', 'list-units', '--no-legend'])
-    result = [item.split(' ')[0].strip() for item in result.split(os.linesep)]
+    (code, result, error) = execute(['systemctl', 'list-units', '--all', '--no-legend'])
+    result = [item.replace('*', '').strip().split(' ')[0].strip() for item in result.split(os.linesep)]
     result = [item for item in result if "vault" in item and not item.endswith('unit.slice')]
     return result

bbtest/steps/orchestration_steps.py

@@ -28,25 +28,25 @@ def step_impl(context, package, operation):
 @given('systemctl contains following active units')
 @then('systemctl contains following active units')
 def step_impl(context):
-  (code, result, error) = execute(["systemctl", "list-units", "--no-legend", "--state=active"])
+  (code, result, error) = execute(["systemctl", "list-units", "--all", "--no-legend", "--state=active"])
   assert code == 0, str(result) + ' ' + str(error)
   items = []
   for row in context.table:
     items.append(row['name'] + '.' + row['type'])
-  result = [item.split(' ')[0].strip() for item in result.split(os.linesep)]
+  result = [item.replace('*', '').strip().split(' ')[0].strip() for item in result.split(os.linesep)]
   result = [item for item in result if item in items]
   assert len(result) > 0, 'units not found\n{}'.format(result)
 
 
 @given('systemctl does not contain following active units')
 @then('systemctl does not contain following active units')
 def step_impl(context):
-  (code, result, error) = execute(["systemctl", "list-units", "--no-legend", "--state=active"])
+  (code, result, error) = execute(["systemctl", "list-units", "--all", "--no-legend", "--state=active"])
   assert code == 0, str(result) + ' ' + str(error)
   items = []
   for row in context.table:
     items.append(row['name'] + '.' + row['type'])
-  result = [item.split(' ')[0].strip() for item in result.split(os.linesep)]
+  result = [item.replace('*', '').strip().split(' ')[0].strip() for item in result.split(os.linesep)]
   result = [item for item in result if item in items]
   assert len(result) == 0, 'units found\n{}'.format(result)
 

dev/lifecycle/test

@@ -38,8 +38,8 @@ lifecycle::go::test() {
   local output="$2"
   local target=$(basename $dir)
 
-  coverage_out=$(tempfile)
-  test_out=$(tempfile)
+  coverage_out=$(mktemp)
+  test_out=$(mktemp)
 
   mkdir -p ${output}
 

packaging/debian/control

@@ -9,6 +9,6 @@ Package: vault
 Architecture: any
 Description: account vault for openbank
  Service holding accounts journal for OpenBank services.
-Depends: libzmq5 (>= 4.3.1~), libzmq5 (<< 4.3.2~), openssl (>= 1.1~), ${shlibs:Depends}
+Depends: libzmq5 (>= 4.3~), libzmq5 (<< 4.4~), openssl (>= 1.1~), ${shlibs:Depends}
 
 

packaging/docker/Dockerfile

@@ -15,7 +15,7 @@
 # ---------------------------------------------------------------------------- #
 # stage 0 bootstrap dependencies
 
-FROM amd64/debian:buster
+FROM amd64/debian:sid-slim
 
 COPY packaging/bin/* /opt/artifacts/
 
@@ -28,7 +28,7 @@ RUN find /opt/artifacts -name vault_*_amd64.deb | xargs -I{} -tx apt-get install
 # ---------------------------------------------------------------------------- #
 # stage 1 link files
 
-FROM amd64/debian:buster
+FROM amd64/debian:sid-slim
 
 COPY --from=0 /opt/artifacts /opt/artifacts
 

perf/appliance_manager.py

@@ -41,13 +41,13 @@ def __install(self, filename):
       raise RuntimeError('code: {}, stdout: [{}], stderr: [{}]'.format(code, result, error))
 
     (code, result, error) = execute([
-      "systemctl", "-t", "service", "--no-legend"
+      "systemctl", "-t", "service", "--all", "--no-legend"
     ])
 
     if code != 0:
       raise RuntimeError('code: {}, stdout: [{}], stderr: [{}]'.format(code, result, error))
 
-    self.services = set([x.split(' ')[0].split('@')[0].split('.service')[0] for x in result.splitlines()])
+    self.services = set([item.replace('*', '').strip().split(' ')[0].split('@')[0].split('.service')[0] for item in result.split(os.linesep)])
 
 
   def __download(self):