Code review comment for ~gpiccoli/maas:nvme_secure_erase

Revision history for this message
Adam Collard (adam-collard) wrote :

 + sudo -u ubuntu -E -H make lint
 ERROR: /run/build/maas/src/metadataserver/user_data/templates/snippets/tests/test_maas_wipe.py Imports are incorrectly sorted.
 --- /run/build/maas/src/metadataserver/user_data/templates/snippets/tests/test_maas_wipe.py:before 2020-06-30 17:06:30.431234
 +++ /run/build/maas/src/metadataserver/user_data/templates/snippets/tests/test_maas_wipe.py:after 2020-06-30 17:09:32.020722
 @@ -6,11 +6,12 @@
  __all__ = []

  import argparse
 +import builtins
  import subprocess
 -import builtins
  from textwrap import dedent
  from unittest.mock import call, MagicMock

 +# hdparm and nvme-cli outputs used in the tests
  from maastesting.factory import factory
  from maastesting.matchers import (
      MockCalledOnceWith,
 @@ -22,29 +23,31 @@
  from snippets.maas_wipe import (
      get_disk_info,
      get_disk_security_info,
 + install_nvme_cli,
      list_disks,
 + nvme_write_zeroes,
      secure_erase_hdparm,
      try_secure_erase,
 - install_nvme_cli,
 - nvme_write_zeroes,
      wipe_quickly,
      WipeError,
      zero_disk,
  )
 -# hdparm and nvme-cli outputs used in the tests
  from snippets.tests.test_maas_wipe_defs import (
 - HDPARM_BEFORE_SECURITY, HDPARM_AFTER_SECURITY,
 + HDPARM_AFTER_SECURITY,
 + HDPARM_BEFORE_SECURITY,
 + HDPARM_SECURITY_ALL_TRUE,
      HDPARM_SECURITY_NOT_SUPPORTED,
 + HDPARM_SECURITY_SUPPORTED_ENABLED,
      HDPARM_SECURITY_SUPPORTED_NOT_ENABLED,
 - HDPARM_SECURITY_SUPPORTED_ENABLED,
 - HDPARM_SECURITY_ALL_TRUE, NVME_IDCTRL_PROLOGUE,
 + NVME_IDCTRL_EPILOGUE,
 + NVME_IDCTRL_FNA_CRYPTFORMAT_SUPPORTED,
 + NVME_IDCTRL_FNA_CRYPTFORMAT_UNSUPPORTED,
      NVME_IDCTRL_OACS_FORMAT_SUPPORTED,
      NVME_IDCTRL_OACS_FORMAT_UNSUPPORTED,
      NVME_IDCTRL_ONCS_WRITEZ_SUPPORTED,
      NVME_IDCTRL_ONCS_WRITEZ_UNSUPPORTED,
 - NVME_IDCTRL_FNA_CRYPTFORMAT_SUPPORTED,
 - NVME_IDCTRL_FNA_CRYPTFORMAT_UNSUPPORTED,
 - NVME_IDCTRL_EPILOGUE)
 + NVME_IDCTRL_PROLOGUE,
 +)

« Back to merge proposal