1. 31 10月, 2018 1 次提交
    • M
      iotests: Unify log outputs between Python 2 and 3 · e21b5f34
      Max Reitz 提交于
      When dumping an object into the log, there are differences between
      Python 2 and 3.  First, unicode strings are prefixed by 'u' in Python 2
      (they are no longer in 3, because unicode strings are the default
      there).  Second, the order of keys in dicts may differ.  Third,
      especially long numbers are longs in Python 2 and thus get an 'L'
      suffix, which does not happen in Python 3.
      
      We can get around all of these differences by dumping objects (lists and
      dicts) in a language-independent format, namely JSON.  The JSON
      generator even allows emitting dicts with their keys sorted
      alphabetically.
      
      This changes the output of all tests that use these logging functions
      (dict keys are ordered now, strings in dicts are now enclosed in double
      quotes instead of single quotes, the 'L' suffix of large integers is
      dropped, and "true" and "false" are now in lower case).
      The quote change necessitates a small change to a filter used in test
      207.
      Suggested-by: NEduardo Habkost <ehabkost@redhat.com>
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NCleber Rosa <crosa@redhat.com>
      Message-Id: <20181022135307.14398-10-mreitz@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      e21b5f34
  2. 08 5月, 2018 1 次提交
    • M
      iotests: Add test for cancelling a mirror job · dc885fff
      Max Reitz 提交于
      We already have an extensive mirror test (041) which does cover
      cancelling a mirror job, especially after it has emitted the READY
      event.  However, it does not check what exact events are emitted after
      block-job-cancel is executed.  More importantly, it does not use
      throttling to ensure that it covers the case of block-job-cancel before
      READY.
      
      It would be possible to add this case to 041, but considering it is
      already our largest test file, it makes sense to create a new file for
      these cases.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Message-id: 20180501220509.14152-3-mreitz@redhat.com
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      dc885fff